[#LU-6210] change positional struct initializers to C99 initializers

[LU-6210] change positional struct initializers to C99 initializers Created: 04/Feb/15 Updated: 31/Jan/18 Resolved: 31/Jan/18
Status:	Closed
Project:	Lustre
Component/s:	None
Affects Version/s:	None
Fix Version/s:	Lustre 2.11.0, Lustre 2.10.3

Type:

Task

Priority:

Minor

Reporter:

Andreas Dilger

Assignee:

Steve Guminski (Inactive)

Resolution:

Fixed

Votes:

Labels:

easy, patch

Attachments:

struct_c89.py

Rank (Obsolete):

17372

Description

In the libcfs and lnet code there are many places where positional struct initializers are used instead of named C99 initializers:

static struct netstrfns  libcfs_netstrfns[] = {
        {/* .nf_type      */  LOLND,
         /* .nf_name      */  "lo",
         /* .nf_modname   */  "klolnd",
         /* .nf_addr2str  */  libcfs_decnum_addr2str,
         /* .nf_str2addr  */  libcfs_lo_str2addr,
         /* .nf_parse_addr*/  libcfs_num_parse,
         /* .nf_print_addrlist*/  libcfs_num_addr_range_print,
         /* .nf_match_addr*/      libcfs_num_match,
         /* .nf_is_contiguous */  cfs_num_is_contiguous,
         /* .nf_min_max   */      cfs_num_min_max},

instead of

static struct netstrfns  libcfs_netstrfns[] = {
        {
                 .nf_type              =  LOLND,
                 .nf_name              = "lo",
                 .nf_modname           = "klolnd",
                 .nf_addr2str          = libcfs_decnum_addr2str,
                 .nf_str2addr          = libcfs_lo_str2addr,
                 .nf_parse_addr        = libcfs_num_parse,
                 .nf_print_addrlist    = libcfs_num_addr_range_print,
                 .nf_match_addr        = libcfs_num_match,
                 .nf_is_contiguous     = cfs_num_is_contiguous,
                 .nf_min_max           = cfs_num_min_max},

This was done because WinNT didn't have C99 initializer support, but we don't care about that anymore.

All of the positional struct initializers in libcfs, lnet, and lustre should be changed to named initializers, probably in several independent patches for different subdirectories.

Comments

Comment by Gerrit Updater [ 31/May/15 ]

James Simmons (uja.ornl@yahoo.com) uploaded a new patch: http://review.whamcloud.com/15088
Subject: ~~LU-6210~~ lnet: Use C99 initializers for struct netstrfns
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 6b7a727b5da8107b170248f5223ec8c994aed386

Comment by James A Simmons [ 19/Jun/15 ]

Are their any others besides struct netstrfns that need to be changed?

Comment by Joseph Gmitter (Inactive) [ 11/Aug/15 ]

Hi Dmitry,
Can you have a look at the patch?
Thanks.
Joe

Comment by Gerrit Updater [ 28/Aug/15 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch http://review.whamcloud.com/15088/
Subject: ~~LU-6210~~ lnet: Use C99 initializers for struct netstrfns
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: f5c36c5fd310f305860b2d693cd61879c7d9fb69

Comment by James A Simmons [ 28/Aug/15 ]

Please leave this ticket open. I except more patches in the future.

Comment by James A Simmons [ 19/Oct/16 ]

Does anyone know of a good grep to find the remaining C89 initializers left? I haven't come up with a good yet.

Comment by Steve Guminski (Inactive) [ 19/Oct/16 ]

Not yet. My attempt with grep required me to manually inspect the results. I've been considering using Perl or Python.

Comment by Steve Guminski (Inactive) [ 24/Oct/16 ]

I wrote a Python script (see attachments for this ticket above) to parse through the source tree to find any struct initializations that use C89 syntax. So far, I've noticed it generated one false positive, but otherwise it seems to be helpful in automating the search for obsolete initializers.

Just run it in the top directory of the source code tree, and the results will be printed to stdout.

Comment by Gerrit Updater [ 24/Oct/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23332
Subject: ~~LU-6210~~ libcfs: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: b0d266d42b85ae450cb4132ee0c8b0f4a264bc01

Comment by Gerrit Updater [ 28/Oct/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23463
Subject: ~~LU-6210~~ snmp: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 0a095570c8230a4ea67ead0a1d4562cd9cd53e9e

Comment by Gerrit Updater [ 31/Oct/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23493
Subject: ~~LU-6210~~ lnet: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: e2c98d9d6754415d96677078219d0d36b4ec2876

Comment by Gerrit Updater [ 02/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23537
Subject: ~~LU-6210~~ utils: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 54cbef288fb931acaff6d5b4688db7df4318f660

Comment by Gerrit Updater [ 03/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23568
Subject: ~~LU-6210~~ tests: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 035ac369064086791d03c0f3d00fd152091bc5e5

Comment by Gerrit Updater [ 09/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23677
Subject: ~~LU-6210~~ gss: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 1f25d8f2f4b2d2f6ed7de5bf0565a7359792d270

Comment by Gerrit Updater [ 10/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23697
Subject: ~~LU-6210~~ obd: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: fa8d511e929ca2df797ff07247c04b91b1df7420

Comment by Gerrit Updater [ 10/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23702
Subject: ~~LU-6210~~ mdt: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: bcd5652194f160360e4b830f20ff25f91c4e7ed1

Comment by Gerrit Updater [ 14/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23743
Subject: ~~LU-6210~~ ldlm: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 4849d5ea2cc3df7acde1a2bf116bca40483bdbcc

Comment by Gerrit Updater [ 14/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23747
Subject: ~~LU-6210~~ mdd: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 39ed194aee23d6db54c4b5aac2d49159cf579d56

Comment by Gerrit Updater [ 14/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23754
Subject: ~~LU-6210~~ lod: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 163a83ddb6ba7fbaa55b1a16e437c181ac924fa7

Comment by Gerrit Updater [ 15/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23770
Subject: ~~LU-6210~~ osd: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: ec43d3752424f50bb02eacd322bb4d745d6956f6

Comment by Gerrit Updater [ 16/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23789
Subject: ~~LU-6210~~ fid: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 2008e1d3a63fc0d53f5b3b432d25c606f4beca23

Comment by Gerrit Updater [ 16/Nov/16 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: http://review.whamcloud.com/23794
Subject: ~~LU-6210~~ mgs: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 6a376830b02c3333c5cfe3b18e18d21305adc232

Comment by Gerrit Updater [ 17/Dec/16 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23332/
Subject: ~~LU-6210~~ libcfs: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: ef6bb2cd842d18e6fbe4f6160467a9318c1862e0

Comment by James A Simmons [ 19/Dec/16 ]

Besides the converts you have done we also have cases like:

const struct ldlm_callback_suite null_cbs =

{ NULL }

;

Comment by Gerrit Updater [ 01/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23463/
Subject: ~~LU-6210~~ snmp: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: c7558380b8e6dc6ac23879959731938bd5d32709

Comment by Gerrit Updater [ 01/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23568/
Subject: ~~LU-6210~~ tests: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: f13b2a4cea69d8c4c079d03d58f55d32a54a9679

Comment by Gerrit Updater [ 01/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23697/
Subject: ~~LU-6210~~ obd: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 4ddad88d15d8f9e36c5cbb9fd5611a3d8e16ea8c

Comment by Gerrit Updater [ 01/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23702/
Subject: ~~LU-6210~~ mdt: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: e439ba810daaebd7a51a112100a182caca72ac35

Comment by Gerrit Updater [ 01/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23743/
Subject: ~~LU-6210~~ ldlm: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: ee41ed7803c860cb79782b3d7df8ac2b8e0ab31a

Comment by Gerrit Updater [ 01/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23770/
Subject: ~~LU-6210~~ osd: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 226fdfbd8d177587787f473f4fb48714e1ffad91

Comment by Gerrit Updater [ 01/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23789/
Subject: ~~LU-6210~~ fid: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: cc311c0c9f884234a3458f471640a40d24c011b5

Comment by Gerrit Updater [ 01/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23794/
Subject: ~~LU-6210~~ mgs: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 5419eabdfedd80d3f30aa456ad7dd35c3198729b

Comment by Gerrit Updater [ 18/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23754/
Subject: ~~LU-6210~~ lod: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 874690977923f9fa984f608e7bf1d6effda04e6b

Comment by Minh Diep [ 18/Jan/17 ]

Landed for 2.10

Comment by James A Simmons [ 18/Jan/17 ]

More patches are left.

Comment by Gerrit Updater [ 24/Jan/17 ]

Steve Guminski (stephenx.guminski@intel.com) uploaded a new patch: https://review.whamcloud.com/25063
Subject: ~~LU-6210~~ utils: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 39247780ce19e634c0561b0923ae13a6821eeccd

Comment by Gerrit Updater [ 31/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23493/
Subject: ~~LU-6210~~ lnet: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 587a25e227024c89eb0802d1b311b5521fd5793c

Comment by Gerrit Updater [ 31/Jan/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23677/
Subject: ~~LU-6210~~ gss: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 80d5a0ed4faab5bb21bcbf856765fd804002d145

Comment by Gerrit Updater [ 15/Feb/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23537/
Subject: ~~LU-6210~~ utils: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 70e9d4ecc9130aeed1260d78cd8b33a5cde6edd7

Comment by Gerrit Updater [ 01/Mar/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/23747/
Subject: ~~LU-6210~~ mdd: Change positional struct initializers to C99
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 37cef588d339191f4ed0b8f1f11822f0231dcd78

Comment by James A Simmons [ 26/Apr/17 ]

Actually their is one lonely patch left so I think this can make it for 2.10

Comment by Steve Guminski (Inactive) [ 26/Apr/17 ]

I've been working on this ticket as a background task, and I actually have several local patches that I haven't submitted yet. There seems to be a lot of activity in this area, so the patch that I have submitted has failed to merge several times due to conflicts. I refrained from submitting all of the patches as a series since a merge failure in a single patch would require the entire series to be rebased and retested whenever a single patch got a conflict. At this point, should I just submit all of my local patches using separate topic branches in the hope that some of them can land?

Comment by Peter Jones [ 26/Apr/17 ]

James - I did talk to Steve about this before descoping it. Any patches ready in the 2.10 timeframe can still land but its just noise to track it as if it has to be fixed for 2.10

Comment by James A Simmons [ 26/Apr/17 ]

Oh, sorry I misunderstood. Thanks Peter for clarifying. Thank you Steve for the update. I personally would recommend not doing a series. Just do the shotgun approach and submit each patch individually. This way some will land. Yeah you have to deal with rebasing some of the patch after they land but is this any different what happens now with the unrelated changes and maloo failures that require rebasing.

Comment by Steve Guminski (Inactive) [ 26/Apr/17 ]

Thanks, James. I'll submit what I've got as individual patches and deal with any merge failures as they occur. Hopefully at least some of the patches will be able to land cleanly.

Comment by Gerrit Updater [ 07/Jun/17 ]

Oleg Drokin (oleg.drokin@intel.com) merged in patch https://review.whamcloud.com/25063/
Subject: ~~LU-6210~~ utils: Use C99 struct initializers in lfs_setstripe()
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: d61792d0f5fa1e313ec216a5dcb833381cbec92b

Comment by Peter Jones [ 07/Jun/17 ]

Dare I ask - is that the last one?!

Comment by Steve Guminski (Inactive) [ 08/Jun/17 ]

Unfortunately, I was having so much trouble getting this landed due to conflicts that I had to split this up into several smaller patches. Due to higher priority work and a severe laptop problem last week, I was not able to get a chance to submit these other patches yet. The patches are written and locally tested, and I plan to rebase and submit them today.