LU-9679 modules: Use LIST_HEAD for declaring list_heads

Rather than
  struct list_head foo = LIST_HEAD_INIT(foo);
use
  LIST_HEAD(foo);

This is shorter and more in-keeping with upstream style.

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I36aa8c7e0763f3dfc88fe482cd28935184c1effa
Reviewed-on: https://review.whamcloud.com/36669
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: Shaun Tancheff <stancheff@cray.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/contrib/scripts/spelling.txt b/contrib/scripts/spelling.txt
index 470c62b..b7ec2fe 100644 (file)
--- a/contrib/scripts/spelling.txt
+++ b/contrib/scripts/spelling.txt
@@ -72,7 +72,7 @@ cfs_list_for_each_entry_safe||list_for_each_entry_safe
 cfs_list_for_each_entry_typed||list_for_each_entry_typed
 cfs_list_for_each_prev||list_for_each_prev
 cfs_list_for_each_safe||list_for_each_safe
 cfs_list_for_each_entry_typed||list_for_each_entry_typed
 cfs_list_for_each_prev||list_for_each_prev
 cfs_list_for_each_safe||list_for_each_safe

-CFS_LIST_HEAD||struct list_head foo = LIST_HEAD_INIT(foo);
+CFS_LIST_HEAD||LIST_HEAD(foo);

 CFS_LIST_HEAD_INIT||LIST_HEAD_INIT
 cfs_list_move||list_move
 cfs_list_move_tail||list_move_tail
 CFS_LIST_HEAD_INIT||LIST_HEAD_INIT
 cfs_list_move||list_move
 cfs_list_move_tail||list_move_tail

diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c
index 979447a..dde4cfd 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/lnet/klnds/o2iblnd/o2iblnd.c
@@ -480,7 +480,7 @@ kiblnd_del_peer_locked(struct kib_peer_ni *peer_ni)
 static int
 kiblnd_del_peer(struct lnet_ni *ni, lnet_nid_t nid)
 {
 static int
 kiblnd_del_peer(struct lnet_ni *ni, lnet_nid_t nid)
 {

-       struct list_head        zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);

        struct list_head        *ptmp;
        struct list_head        *pnxt;
        struct kib_peer_ni              *peer_ni;
        struct list_head        *ptmp;
        struct list_head        *pnxt;
        struct kib_peer_ni              *peer_ni;


@@ -1788,7 +1788,7 @@ kiblnd_map_tx_pages(struct kib_tx *tx, struct kib_rdma_desc *rd)
 void
 kiblnd_fmr_pool_unmap(struct kib_fmr *fmr, int status)
 {
 void
 kiblnd_fmr_pool_unmap(struct kib_fmr *fmr, int status)
 {

-       struct list_head zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);

        struct kib_fmr_pool *fpo = fmr->fmr_pool;
        struct kib_fmr_poolset *fps;
        time64_t now = ktime_get_seconds();
        struct kib_fmr_pool *fpo = fmr->fmr_pool;
        struct kib_fmr_poolset *fps;
        time64_t now = ktime_get_seconds();


@@ -2145,7 +2145,7 @@ kiblnd_pool_is_idle(struct kib_pool *pool, time64_t now)
 void
 kiblnd_pool_free_node(struct kib_pool *pool, struct list_head *node)
 {
 void
 kiblnd_pool_free_node(struct kib_pool *pool, struct list_head *node)
 {

-       struct list_head zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);

        struct kib_poolset *ps = pool->po_owner;
        struct kib_pool *tmp;
        time64_t now = ktime_get_seconds();
        struct kib_poolset *ps = pool->po_owner;
        struct kib_pool *tmp;
        time64_t now = ktime_get_seconds();


@@ -2725,9 +2725,9 @@ kiblnd_dev_need_failover(struct kib_dev *dev, struct net *ns)
 int
 kiblnd_dev_failover(struct kib_dev *dev, struct net *ns)
 {
 int
 kiblnd_dev_failover(struct kib_dev *dev, struct net *ns)
 {

-       struct list_head    zombie_tpo = LIST_HEAD_INIT(zombie_tpo);
-       struct list_head    zombie_ppo = LIST_HEAD_INIT(zombie_ppo);
-       struct list_head    zombie_fpo = LIST_HEAD_INIT(zombie_fpo);
+       LIST_HEAD(zombie_tpo);
+       LIST_HEAD(zombie_ppo);
+       LIST_HEAD(zombie_fpo);

         struct rdma_cm_id  *cmid  = NULL;
        struct kib_hca_dev *hdev  = NULL;
        struct kib_hca_dev *old;
         struct rdma_cm_id  *cmid  = NULL;
        struct kib_hca_dev *hdev  = NULL;
        struct kib_hca_dev *old;

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index e6c5e16..c26811c 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -2151,7 +2151,7 @@ kiblnd_handle_early_rxs(struct kib_conn *conn)
 void
 kiblnd_abort_txs(struct kib_conn *conn, struct list_head *txs)
 {
 void
 kiblnd_abort_txs(struct kib_conn *conn, struct list_head *txs)
 {

-       struct list_head         zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);

        struct list_head        *tmp;
        struct list_head        *nxt;
        struct kib_tx *tx;
        struct list_head        *tmp;
        struct list_head        *nxt;
        struct kib_tx *tx;


@@ -2241,7 +2241,7 @@ static void
 kiblnd_peer_connect_failed(struct kib_peer_ni *peer_ni, int active,
                           int error)
 {
 kiblnd_peer_connect_failed(struct kib_peer_ni *peer_ni, int active,
                           int error)
 {

-       struct list_head zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);

        unsigned long   flags;
 
        LASSERT (error != 0);
        unsigned long   flags;
 
        LASSERT (error != 0);


@@ -3369,9 +3369,9 @@ kiblnd_conn_timed_out_locked(struct kib_conn *conn)
 static void
 kiblnd_check_conns (int idx)
 {
 static void
 kiblnd_check_conns (int idx)
 {

-       struct list_head  closes = LIST_HEAD_INIT(closes);
-       struct list_head  checksends = LIST_HEAD_INIT(checksends);
-       struct list_head  timedout_txs = LIST_HEAD_INIT(timedout_txs);
+       LIST_HEAD(closes);
+       LIST_HEAD(checksends);
+       LIST_HEAD(timedout_txs);

        struct list_head *peers = &kiblnd_data.kib_peers[idx];
        struct list_head *ptmp;
        struct kib_peer_ni *peer_ni;
        struct list_head *peers = &kiblnd_data.kib_peers[idx];
        struct list_head *ptmp;
        struct kib_peer_ni *peer_ni;

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index 8d74726..6fd707c 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -564,7 +564,7 @@ ksocknal_del_peer_locked(struct ksock_peer_ni *peer_ni, __u32 ip)
 static int
 ksocknal_del_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ip)
 {
 static int
 ksocknal_del_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ip)
 {

-       struct list_head zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);

        struct list_head *ptmp;
        struct list_head *pnxt;
        struct ksock_peer_ni *peer_ni;
        struct list_head *ptmp;
        struct list_head *pnxt;
        struct ksock_peer_ni *peer_ni;


@@ -1016,7 +1016,7 @@ ksocknal_create_conn(struct lnet_ni *ni, struct ksock_route *route,
                     struct socket *sock, int type)
 {
        rwlock_t *global_lock = &ksocknal_data.ksnd_global_lock;
                     struct socket *sock, int type)
 {
        rwlock_t *global_lock = &ksocknal_data.ksnd_global_lock;

-       struct list_head zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);

        struct lnet_process_id peerid;
        struct list_head *tmp;
        u64 incarnation;
        struct lnet_process_id peerid;
        struct list_head *tmp;
        u64 incarnation;


@@ -1530,7 +1530,7 @@ ksocknal_finalize_zcreq(struct ksock_conn *conn)
        struct ksock_peer_ni *peer_ni = conn->ksnc_peer;
        struct ksock_tx *tx;
        struct ksock_tx *tmp;
        struct ksock_peer_ni *peer_ni = conn->ksnc_peer;
        struct ksock_tx *tx;
        struct ksock_tx *tmp;

-       struct list_head zlist = LIST_HEAD_INIT(zlist);
+       LIST_HEAD(zlist);

 
        /* NB safe to finalize TXs because closing of socket will
         * abort all buffered data */
 
        /* NB safe to finalize TXs because closing of socket will
         * abort all buffered data */

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 1da3fe5..f7b39b7 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -1545,7 +1545,7 @@ int ksocknal_scheduler(void *arg)
                }
 
                if (!list_empty(&sched->kss_tx_conns)) {
                }
 
                if (!list_empty(&sched->kss_tx_conns)) {

-                       struct list_head zlist = LIST_HEAD_INIT(zlist);
+                       LIST_HEAD(zlist);

 
                        if (!list_empty(&sched->kss_zombie_noop_txs)) {
                                list_add(&zlist,
 
                        if (!list_empty(&sched->kss_zombie_noop_txs)) {
                                list_add(&zlist,


@@ -1933,7 +1933,7 @@ ksocknal_recv_hello(struct lnet_ni *ni, struct ksock_conn *conn,
 static int
 ksocknal_connect(struct ksock_route *route)
 {
 static int
 ksocknal_connect(struct ksock_route *route)
 {

-       struct list_head zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);

        struct ksock_peer_ni *peer_ni = route->ksnr_peer;
         int               type;
         int               wanted;
        struct ksock_peer_ni *peer_ni = route->ksnr_peer;
         int               type;
         int               wanted;


@@ -2416,7 +2416,7 @@ static inline void
 ksocknal_flush_stale_txs(struct ksock_peer_ni *peer_ni)
 {
        struct ksock_tx *tx;
 ksocknal_flush_stale_txs(struct ksock_peer_ni *peer_ni)
 {
        struct ksock_tx *tx;

-       struct list_head stale_txs = LIST_HEAD_INIT(stale_txs);
+       LIST_HEAD(stale_txs);

 
        write_lock_bh(&ksocknal_data.ksnd_global_lock);
 
 
        write_lock_bh(&ksocknal_data.ksnd_global_lock);
 

diff --git a/lnet/klnds/socklnd/socklnd_proto.c b/lnet/klnds/socklnd/socklnd_proto.c
index 6dd648a..e0fd857 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_proto.c
+++ b/lnet/klnds/socklnd/socklnd_proto.c
@@ -407,7 +407,7 @@ ksocknal_handle_zcack(struct ksock_conn *conn, __u64 cookie1, __u64 cookie2)
        struct ksock_peer_ni *peer_ni = conn->ksnc_peer;
        struct ksock_tx *tx;
        struct ksock_tx *tmp;
        struct ksock_peer_ni *peer_ni = conn->ksnc_peer;
        struct ksock_tx *tx;
        struct ksock_tx *tmp;

-       struct list_head zlist = LIST_HEAD_INIT(zlist);
+       LIST_HEAD(zlist);

        int count;
 
         if (cookie1 == 0)
        int count;
 
         if (cookie1 == 0)

diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c
index 7af6ced..b3e28b1 100644 (file)
--- a/lnet/lnet/config.c
+++ b/lnet/lnet/config.c
@@ -1313,7 +1313,7 @@ lnet_parse_routes (char *routes, int *im_a_router)
 static int
 lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip)
 {
 static int
 lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip)
 {

-       struct list_head list = LIST_HEAD_INIT(list);
+       LIST_HEAD(list);

        int             rc;
        int             i;
 
        int             rc;
        int             i;
 

diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c
index 7737744..c1c1192 100644 (file)
--- a/lnet/lnet/lib-md.c
+++ b/lnet/lnet/lib-md.c
@@ -373,8 +373,8 @@ int
 LNetMDAttach(struct lnet_handle_me meh, struct lnet_md umd,
             enum lnet_unlink unlink, struct lnet_handle_md *handle)
 {
 LNetMDAttach(struct lnet_handle_me meh, struct lnet_md umd,
             enum lnet_unlink unlink, struct lnet_handle_md *handle)
 {

-       struct list_head        matches = LIST_HEAD_INIT(matches);
-       struct list_head        drops = LIST_HEAD_INIT(drops);
+       LIST_HEAD(matches);
+       LIST_HEAD(drops);

        struct lnet_me          *me;
        struct lnet_libmd       *md;
        int                     cpt;
        struct lnet_me          *me;
        struct lnet_libmd       *md;
        int                     cpt;

diff --git a/lnet/lnet/lib-ptl.c b/lnet/lnet/lib-ptl.c
index 75a352d..e8f7ef7 100644 (file)
--- a/lnet/lnet/lib-ptl.c
+++ b/lnet/lnet/lib-ptl.c
@@ -920,7 +920,7 @@ int
 lnet_clear_lazy_portal(struct lnet_ni *ni, int portal, char *reason)
 {
        struct lnet_portal      *ptl;
 lnet_clear_lazy_portal(struct lnet_ni *ni, int portal, char *reason)
 {
        struct lnet_portal      *ptl;

-       struct list_head        zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);

 
        if (portal < 0 || portal >= the_lnet.ln_nportals)
                return -EINVAL;
 
        if (portal < 0 || portal >= the_lnet.ln_nportals)
                return -EINVAL;

diff --git a/lustre/ldlm/ldlm_inodebits.c b/lustre/ldlm/ldlm_inodebits.c
index 22daed5..c8c9fa5 100644 (file)
--- a/lustre/ldlm/ldlm_inodebits.c
+++ b/lustre/ldlm/ldlm_inodebits.c
@@ -74,7 +74,7 @@ int ldlm_reprocess_inodebits_queue(struct ldlm_resource *res,
        __u64 flags;
        int rc = LDLM_ITER_CONTINUE;
        enum ldlm_error err;
        __u64 flags;
        int rc = LDLM_ITER_CONTINUE;
        enum ldlm_error err;

-       struct list_head bl_ast_list = LIST_HEAD_INIT(bl_ast_list);
+       LIST_HEAD(bl_ast_list);

        struct ldlm_ibits_queues *queues = res->lr_ibits_queues;
        int i;
 
        struct ldlm_ibits_queues *queues = res->lr_ibits_queues;
        int i;
 


@@ -95,7 +95,7 @@ restart:
               PLDLMRES(res), res);
 
        for (i = 0; i < MDS_INODELOCK_NUMBITS; i++) {
               PLDLMRES(res), res);
 
        for (i = 0; i < MDS_INODELOCK_NUMBITS; i++) {

-               struct list_head rpc_list = LIST_HEAD_INIT(rpc_list);
+               LIST_HEAD(rpc_list);

                struct list_head *head = &queues->liq_waiting[i];
                struct ldlm_lock *pending;
                struct ldlm_ibits_node *node;
                struct list_head *head = &queues->liq_waiting[i];
                struct ldlm_lock *pending;
                struct ldlm_ibits_node *node;

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 23d66da..4276c1e 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -1723,7 +1723,7 @@ static enum ldlm_error ldlm_lock_enqueue_helper(struct ldlm_lock *lock,
 {
        struct ldlm_resource *res = lock->l_resource;
        enum ldlm_error rc = ELDLM_OK;
 {
        struct ldlm_resource *res = lock->l_resource;
        enum ldlm_error rc = ELDLM_OK;

-       struct list_head rpc_list = LIST_HEAD_INIT(rpc_list);
+       LIST_HEAD(rpc_list);

        ldlm_processing_policy policy;
 
        ENTRY;
        ldlm_processing_policy policy;
 
        ENTRY;


@@ -1915,7 +1915,7 @@ int ldlm_reprocess_queue(struct ldlm_resource *res, struct list_head *queue,
        __u64 flags;
        int rc = LDLM_ITER_CONTINUE;
        enum ldlm_error err;
        __u64 flags;
        int rc = LDLM_ITER_CONTINUE;
        enum ldlm_error err;

-       struct list_head bl_ast_list = LIST_HEAD_INIT(bl_ast_list);
+       LIST_HEAD(bl_ast_list);

 
        ENTRY;
 
 
        ENTRY;
 


@@ -1929,7 +1929,7 @@ int ldlm_reprocess_queue(struct ldlm_resource *res, struct list_head *queue,
 restart:
        list_for_each_safe(tmp, pos, queue) {
                struct ldlm_lock *pending;
 restart:
        list_for_each_safe(tmp, pos, queue) {
                struct ldlm_lock *pending;

-               struct list_head rpc_list = LIST_HEAD_INIT(rpc_list);
+               LIST_HEAD(rpc_list);

 
                pending = list_entry(tmp, struct ldlm_lock, l_res_link);
 
 
                pending = list_entry(tmp, struct ldlm_lock, l_res_link);
 

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 520ec17..fa05c94 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -837,7 +837,7 @@ int ldlm_prep_elc_req(struct obd_export *exp, struct ptlrpc_request *req,
        struct ldlm_namespace   *ns = exp->exp_obd->obd_namespace;
        struct req_capsule      *pill = &req->rq_pill;
        struct ldlm_request     *dlm = NULL;
        struct ldlm_namespace   *ns = exp->exp_obd->obd_namespace;
        struct req_capsule      *pill = &req->rq_pill;
        struct ldlm_request     *dlm = NULL;

-       struct list_head        head = LIST_HEAD_INIT(head);
+       LIST_HEAD(head);

        enum ldlm_lru_flags lru_flags;
        int avail, to_free, pack = 0;
        int rc;
        enum ldlm_lru_flags lru_flags;
        int avail, to_free, pack = 0;
        int rc;


@@ -1572,7 +1572,7 @@ int ldlm_cli_cancel(const struct lustre_handle *lockh,
        __u64 rc = 0;
        struct ldlm_namespace *ns;
        struct ldlm_lock *lock;
        __u64 rc = 0;
        struct ldlm_namespace *ns;
        struct ldlm_lock *lock;

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

 
        ENTRY;
 
 
        ENTRY;
 


@@ -1663,7 +1663,7 @@ EXPORT_SYMBOL(ldlm_cli_cancel);
 int ldlm_cli_cancel_list_local(struct list_head *cancels, int count,
                               enum ldlm_cancel_flags cancel_flags)
 {
 int ldlm_cli_cancel_list_local(struct list_head *cancels, int count,
                               enum ldlm_cancel_flags cancel_flags)
 {

-       struct list_head head = LIST_HEAD_INIT(head);
+       LIST_HEAD(head);

        struct ldlm_lock *lock, *next;
        int left = 0, bl_ast = 0;
        __u64 rc;
        struct ldlm_lock *lock, *next;
        int left = 0, bl_ast = 0;
        __u64 rc;


@@ -2132,7 +2132,7 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,
                    enum ldlm_cancel_flags cancel_flags,
                    enum ldlm_lru_flags lru_flags)
 {
                    enum ldlm_cancel_flags cancel_flags,
                    enum ldlm_lru_flags lru_flags)
 {

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

        int count, rc;
 
        ENTRY;
        int count, rc;
 
        ENTRY;


@@ -2295,7 +2295,7 @@ int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns,
                                    enum ldlm_cancel_flags flags, void *opaque)
 {
        struct ldlm_resource *res;
                                    enum ldlm_cancel_flags flags, void *opaque)
 {
        struct ldlm_resource *res;

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

        int count;
        int rc;
 
        int count;
        int rc;
 


@@ -2638,7 +2638,7 @@ static int replay_one_lock(struct obd_import *imp, struct ldlm_lock *lock)
 static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns)
 {
        int canceled;
 static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns)
 {
        int canceled;

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

 
        CDEBUG(D_DLMTRACE,
               "Dropping as many unused locks as possible before replay for namespace %s (%d)\n",
 
        CDEBUG(D_DLMTRACE,
               "Dropping as many unused locks as possible before replay for namespace %s (%d)\n",


@@ -2659,7 +2659,7 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns)
 int ldlm_replay_locks(struct obd_import *imp)
 {
        struct ldlm_namespace *ns = imp->imp_obd->obd_namespace;
 int ldlm_replay_locks(struct obd_import *imp)
 {
        struct ldlm_namespace *ns = imp->imp_obd->obd_namespace;

-       struct list_head list = LIST_HEAD_INIT(list);
+       LIST_HEAD(list);

        struct ldlm_lock *lock, *next;
        int rc = 0;
 
        struct ldlm_lock *lock, *next;
        int rc = 0;
 

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index 8045378..841c3ca 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -76,7 +76,7 @@ void lov_tgts_putref(struct obd_device *obd)
        mutex_lock(&lov->lov_lock);
        /* ok to dec to 0 more than once -- ltd_exp's will be null */
        if (atomic_dec_and_test(&lov->lov_refcount) && lov->lov_death_row) {
        mutex_lock(&lov->lov_lock);
        /* ok to dec to 0 more than once -- ltd_exp's will be null */
        if (atomic_dec_and_test(&lov->lov_refcount) && lov->lov_death_row) {

-               struct list_head kill = LIST_HEAD_INIT(kill);
+               LIST_HEAD(kill);

                struct lov_tgt_desc *tgt, *n;
                int i;
 
                struct lov_tgt_desc *tgt, *n;
                int i;
 

diff --git a/lustre/mdc/mdc_dev.c b/lustre/mdc/mdc_dev.c
index 036dc92..a640874 100644 (file)
--- a/lustre/mdc/mdc_dev.c
+++ b/lustre/mdc/mdc_dev.c
@@ -700,7 +700,7 @@ int mdc_enqueue_send(const struct lu_env *env, struct obd_export *exp,
        enum ldlm_mode mode;
        bool glimpse = *flags & LDLM_FL_HAS_INTENT;
        __u64 match_flags = *flags;
        enum ldlm_mode mode;
        bool glimpse = *flags & LDLM_FL_HAS_INTENT;
        __u64 match_flags = *flags;

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

        int rc, count;
 
        ENTRY;
        int rc, count;
 
        ENTRY;

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index a1ec413..7923428 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -258,7 +258,7 @@ mdc_intent_open_pack(struct obd_export *exp, struct lookup_intent *it,
        const void              *lmm = op_data->op_data;
        __u32                    lmmsize = op_data->op_data_size;
        __u32                    mdt_md_capsule_size;
        const void              *lmm = op_data->op_data;
        __u32                    lmmsize = op_data->op_data_size;
        __u32                    mdt_md_capsule_size;

-       struct list_head         cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

        int                      count = 0;
        enum ldlm_mode           mode;
        int                      rc;
        int                      count = 0;
        enum ldlm_mode           mode;
        int                      rc;


@@ -436,7 +436,7 @@ mdc_intent_getxattr_pack(struct obd_export *exp,
        struct ptlrpc_request   *req;
        struct ldlm_intent      *lit;
        int                     rc, count = 0;
        struct ptlrpc_request   *req;
        struct ldlm_intent      *lit;
        int                     rc, count = 0;

-       struct list_head        cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

        u32 ea_vals_buf_size = GA_DEFAULT_EA_VAL_LEN * GA_DEFAULT_EA_NUM;
 
        ENTRY;
        u32 ea_vals_buf_size = GA_DEFAULT_EA_VAL_LEN * GA_DEFAULT_EA_NUM;
 
        ENTRY;


@@ -589,7 +589,7 @@ static struct ptlrpc_request *mdc_intent_layout_pack(struct obd_export *exp,
                                                     struct md_op_data *op_data)
 {
        struct obd_device     *obd = class_exp2obd(exp);
                                                     struct md_op_data *op_data)
 {
        struct obd_device     *obd = class_exp2obd(exp);

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

        struct ptlrpc_request *req;
        struct ldlm_intent    *lit;
        struct layout_intent  *layout;
        struct ptlrpc_request *req;
        struct ldlm_intent    *lit;
        struct layout_intent  *layout;

diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c
index 07c3e05..79473e8 100644 (file)
--- a/lustre/mdc/mdc_reint.c
+++ b/lustre/mdc/mdc_reint.c
@@ -107,7 +107,7 @@ int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
 int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
                void *ea, size_t ealen, struct ptlrpc_request **request)
 {
 int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
                void *ea, size_t ealen, struct ptlrpc_request **request)
 {

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

         struct ptlrpc_request *req;
         int count = 0, rc;
         __u64 bits;
         struct ptlrpc_request *req;
         int count = 0, rc;
         __u64 bits;


@@ -169,7 +169,7 @@ int mdc_create(struct obd_export *exp, struct md_op_data *op_data,
         int count, resends = 0;
         struct obd_import *import = exp->exp_obd->u.cli.cl_import;
         int generation = import->imp_generation;
         int count, resends = 0;
         struct obd_import *import = exp->exp_obd->u.cli.cl_import;
         int generation = import->imp_generation;

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

         ENTRY;
 
        /* For case if upper layer did not alloc fid, do it now. */
         ENTRY;
 
        /* For case if upper layer did not alloc fid, do it now. */


@@ -279,7 +279,7 @@ rebuild:
 int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
                struct ptlrpc_request **request)
 {
 int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
                struct ptlrpc_request **request)
 {

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

         struct obd_device *obd = class_exp2obd(exp);
         struct ptlrpc_request *req = *request;
         int count = 0, rc;
         struct obd_device *obd = class_exp2obd(exp);
         struct ptlrpc_request *req = *request;
         int count = 0, rc;


@@ -341,7 +341,7 @@ int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
 int mdc_link(struct obd_export *exp, struct md_op_data *op_data,
              struct ptlrpc_request **request)
 {
 int mdc_link(struct obd_export *exp, struct md_op_data *op_data,
              struct ptlrpc_request **request)
 {

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

         struct ptlrpc_request *req;
         int count = 0, rc;
         ENTRY;
         struct ptlrpc_request *req;
         int count = 0, rc;
         ENTRY;


@@ -397,7 +397,7 @@ int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,
                const char *old, size_t oldlen, const char *new, size_t newlen,
                struct ptlrpc_request **request)
 {
                const char *old, size_t oldlen, const char *new, size_t newlen,
                struct ptlrpc_request **request)
 {

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

        struct obd_device *obd = exp->exp_obd;
        struct ptlrpc_request *req;
        int count = 0, rc;
        struct obd_device *obd = exp->exp_obd;
        struct ptlrpc_request *req;
        int count = 0, rc;


@@ -477,7 +477,7 @@ int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,
 
 int mdc_file_resync(struct obd_export *exp, struct md_op_data *op_data)
 {
 
 int mdc_file_resync(struct obd_export *exp, struct md_op_data *op_data)
 {

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

        struct ptlrpc_request *req;
        struct ldlm_lock *lock;
        struct mdt_rec_resync *rec;
        struct ptlrpc_request *req;
        struct ldlm_lock *lock;
        struct mdt_rec_resync *rec;

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index b94cf99..93b2e63 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -349,7 +349,7 @@ static int mdc_xattr_common(struct obd_export *exp,const struct req_format *fmt,
        /* Flush local XATTR locks to get rid of a possible cancel RPC */
        if (opcode == MDS_REINT && fid_is_sane(fid) &&
            exp->exp_connect_data.ocd_ibits_known & MDS_INODELOCK_XATTR) {
        /* Flush local XATTR locks to get rid of a possible cancel RPC */
        if (opcode == MDS_REINT && fid_is_sane(fid) &&
            exp->exp_connect_data.ocd_ibits_known & MDS_INODELOCK_XATTR) {

-               struct list_head cancels = LIST_HEAD_INIT(cancels);
+               LIST_HEAD(cancels);

                int count;
 
                /* Without that packing would fail */
                int count;
 
                /* Without that packing would fail */


@@ -2073,7 +2073,7 @@ static int mdc_quotactl(struct obd_device *unused, struct obd_export *exp,
 static int mdc_ioc_swap_layouts(struct obd_export *exp,
                                struct md_op_data *op_data)
 {
 static int mdc_ioc_swap_layouts(struct obd_export *exp,
                                struct md_op_data *op_data)
 {

-       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

        struct ptlrpc_request   *req;
        int                      rc, count;
        struct mdc_swap_layouts *msl, *payload;
        struct ptlrpc_request   *req;
        int                      rc, count;
        struct mdc_swap_layouts *msl, *payload;

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index d6fb942..456891a 100644 (file)
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -118,7 +118,7 @@ int mgc_logname2resid(char *logname, struct ldlm_res_id *res_id, int type)
 EXPORT_SYMBOL(mgc_logname2resid);
 
 /********************** config llog list **********************/
 EXPORT_SYMBOL(mgc_logname2resid);
 
 /********************** config llog list **********************/

-static struct list_head config_llog_list = LIST_HEAD_INIT(config_llog_list);
+static LIST_HEAD(config_llog_list);

 static DEFINE_SPINLOCK(config_list_lock);      /* protects config_llog_list */
 
 /* Take a reference to a config log */
 static DEFINE_SPINLOCK(config_list_lock);      /* protects config_llog_list */
 
 /* Take a reference to a config log */

diff --git a/lustre/mgs/mgs_barrier.c b/lustre/mgs/mgs_barrier.c
index 7ea0915..b624f89 100644 (file)
--- a/lustre/mgs/mgs_barrier.c
+++ b/lustre/mgs/mgs_barrier.c
@@ -121,7 +121,7 @@ static int mgs_barrier_glimpse_lock(const struct lu_env *env,
        struct ldlm_resource *res;
        struct ldlm_glimpse_work *work;
        struct ldlm_glimpse_work *tmp;
        struct ldlm_resource *res;
        struct ldlm_glimpse_work *work;
        struct ldlm_glimpse_work *tmp;

-       struct list_head gl_list = LIST_HEAD_INIT(gl_list);
+       LIST_HEAD(gl_list);

        struct list_head *pos;
        int i;
        int rc;
        struct list_head *pos;
        int i;
        int rc;

diff --git a/lustre/mgs/mgs_nids.c b/lustre/mgs/mgs_nids.c
index c3b7528..2da7902 100644 (file)
--- a/lustre/mgs/mgs_nids.c
+++ b/lustre/mgs/mgs_nids.c
@@ -363,7 +363,7 @@ out:
 static void mgs_nidtbl_fini_fs(struct fs_db *fsdb)
 {
        struct mgs_nidtbl *tbl = &fsdb->fsdb_nidtbl;
 static void mgs_nidtbl_fini_fs(struct fs_db *fsdb)
 {
        struct mgs_nidtbl *tbl = &fsdb->fsdb_nidtbl;

-       struct list_head head = LIST_HEAD_INIT(head);
+       LIST_HEAD(head);

 
        mutex_lock(&tbl->mn_lock);
        tbl->mn_nr_targets = 0;
 
        mutex_lock(&tbl->mn_lock);
        tbl->mn_nr_targets = 0;


@@ -922,7 +922,7 @@ void mgs_fsc_cleanup(struct obd_export *exp)
 {
        struct mgs_export_data *data = &exp->u.eu_mgs_data;
        struct mgs_fsc *fsc, *tmp;
 {
        struct mgs_export_data *data = &exp->u.eu_mgs_data;
        struct mgs_fsc *fsc, *tmp;

-       struct list_head head = LIST_HEAD_INIT(head);
+       LIST_HEAD(head);

 
        spin_lock(&data->med_lock);
        list_splice_init(&data->med_clients, &head);
 
        spin_lock(&data->med_lock);
        list_splice_init(&data->med_clients, &head);

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index 460587c..891d560 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -2085,7 +2085,7 @@ osc_send_write_rpc(const struct lu_env *env, struct client_obd *cli,
                   struct osc_object *osc)
 __must_hold(osc)
 {
                   struct osc_object *osc)
 __must_hold(osc)
 {

-       struct list_head   rpclist = LIST_HEAD_INIT(rpclist);
+       LIST_HEAD(rpclist);

        struct osc_extent *ext;
        struct osc_extent *tmp;
        struct osc_extent *first = NULL;
        struct osc_extent *ext;
        struct osc_extent *tmp;
        struct osc_extent *first = NULL;


@@ -2161,7 +2161,7 @@ __must_hold(osc)
 {
        struct osc_extent *ext;
        struct osc_extent *next;
 {
        struct osc_extent *ext;
        struct osc_extent *next;

-       struct list_head rpclist = LIST_HEAD_INIT(rpclist);
+       LIST_HEAD(rpclist);

        struct extent_rpc_data data = {
                .erd_rpc_list   = &rpclist,
                .erd_page_count = 0,
        struct extent_rpc_data data = {
                .erd_rpc_list   = &rpclist,
                .erd_page_count = 0,


@@ -2794,7 +2794,7 @@ int osc_cache_truncate_start(const struct lu_env *env, struct osc_object *obj,
        struct osc_extent *ext;
        struct osc_extent *waiting = NULL;
        pgoff_t index;
        struct osc_extent *ext;
        struct osc_extent *waiting = NULL;
        pgoff_t index;

-       struct list_head list = LIST_HEAD_INIT(list);
+       LIST_HEAD(list);

        int result = 0;
        bool partial;
        ENTRY;
        int result = 0;
        bool partial;
        ENTRY;


@@ -3012,7 +3012,7 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj,
                              pgoff_t start, pgoff_t end, int hp, int discard)
 {
        struct osc_extent *ext;
                              pgoff_t start, pgoff_t end, int hp, int discard)
 {
        struct osc_extent *ext;

-       struct list_head discard_list = LIST_HEAD_INIT(discard_list);
+       LIST_HEAD(discard_list);

        bool unplug = false;
        int result = 0;
        ENTRY;
        bool unplug = false;
        int result = 0;
        ENTRY;

diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c
index 03c0e50..5a0d0b9 100644 (file)
--- a/lustre/osc/osc_io.c
+++ b/lustre/osc/osc_io.c
@@ -116,7 +116,7 @@ int osc_io_submit(const struct lu_env *env, const struct cl_io_slice *ios,
        struct osc_object *osc  = NULL; /* to keep gcc happy */
        struct osc_page   *opg;
        struct cl_io      *io;
        struct osc_object *osc  = NULL; /* to keep gcc happy */
        struct osc_page   *opg;
        struct cl_io      *io;

-       struct list_head  list = LIST_HEAD_INIT(list);
+       LIST_HEAD(list);

 
        struct cl_page_list *qin      = &queue->c2_qin;
        struct cl_page_list *qout     = &queue->c2_qout;
 
        struct cl_page_list *qin      = &queue->c2_qin;
        struct cl_page_list *qout     = &queue->c2_qout;

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index a5321e3..9dae62a 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -441,7 +441,7 @@ int lru_queue_work(const struct lu_env *env, void *data)
 
 void osc_lru_add_batch(struct client_obd *cli, struct list_head *plist)
 {
 
 void osc_lru_add_batch(struct client_obd *cli, struct list_head *plist)
 {

-       struct list_head lru = LIST_HEAD_INIT(lru);
+       LIST_HEAD(lru);

        struct osc_async_page *oap;
        long npages = 0;
 
        struct osc_async_page *oap;
        long npages = 0;
 

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 1c4e26d..0e0092d 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -577,7 +577,7 @@ static int osc_destroy(const struct lu_env *env, struct obd_export *exp,
         struct client_obd     *cli = &exp->exp_obd->u.cli;
         struct ptlrpc_request *req;
         struct ost_body       *body;
         struct client_obd     *cli = &exp->exp_obd->u.cli;
         struct ptlrpc_request *req;
         struct ost_body       *body;

-       struct list_head       cancels = LIST_HEAD_INIT(cancels);
+       LIST_HEAD(cancels);

         int rc, count;
         ENTRY;
 
         int rc, count;
         ENTRY;
 


@@ -2204,7 +2204,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
        int                             grant = 0;
        int                             rc;
        __u32                           layout_version = 0;
        int                             grant = 0;
        int                             rc;
        __u32                           layout_version = 0;

-       struct list_head                rpc_list = LIST_HEAD_INIT(rpc_list);
+       LIST_HEAD(rpc_list);

        struct ost_body                 *body;
        ENTRY;
        LASSERT(!list_empty(ext_list));
        struct ost_body                 *body;
        ENTRY;
        LASSERT(!list_empty(ext_list));


@@ -3370,7 +3370,7 @@ static struct obd_ops osc_obd_ops = {
 };
 
 static struct shrinker *osc_cache_shrinker;
 };
 
 static struct shrinker *osc_cache_shrinker;

-struct list_head osc_shrink_list = LIST_HEAD_INIT(osc_shrink_list);
+LIST_HEAD(osc_shrink_list);

 DEFINE_SPINLOCK(osc_shrink_lock);
 
 #ifndef HAVE_SHRINKER_COUNT
 DEFINE_SPINLOCK(osc_shrink_lock);
 
 #ifndef HAVE_SHRINKER_COUNT

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index 185e3d3..d7eb0e1 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -1985,7 +1985,7 @@ static int osd_trans_stop(const struct lu_env *env, struct dt_device *dt,
        struct osd_device *osd = osd_dt_dev(th->th_dev);
        struct qsd_instance *qsd = osd_def_qsd(osd);
        struct lquota_trans *qtrans;
        struct osd_device *osd = osd_dt_dev(th->th_dev);
        struct qsd_instance *qsd = osd_def_qsd(osd);
        struct lquota_trans *qtrans;

-       struct list_head truncates = LIST_HEAD_INIT(truncates);
+       LIST_HEAD(truncates);

        int rc = 0, remove_agents = 0;
 
        ENTRY;
        int rc = 0, remove_agents = 0;
 
        ENTRY;

diff --git a/lustre/osd-ldiskfs/osd_iam.c b/lustre/osd-ldiskfs/osd_iam.c
index 5cda6d7..bc58329 100644 (file)
--- a/lustre/osd-ldiskfs/osd_iam.c
+++ b/lustre/osd-ldiskfs/osd_iam.c
@@ -157,7 +157,7 @@
  *
  * No locking. Callers synchronize.
  */
  *
  * No locking. Callers synchronize.
  */

-static struct list_head iam_formats = LIST_HEAD_INIT(iam_formats);
+static LIST_HEAD(iam_formats);

 
 void iam_format_register(struct iam_format *fmt)
 {
 
 void iam_format_register(struct iam_format *fmt)
 {

diff --git a/lustre/ptlrpc/gss/gss_mech_switch.c b/lustre/ptlrpc/gss/gss_mech_switch.c
index 3ee125f..4864191 100644 (file)
--- a/lustre/ptlrpc/gss/gss_mech_switch.c
+++ b/lustre/ptlrpc/gss/gss_mech_switch.c
@@ -61,7 +61,7 @@
 #include "gss_api.h"
 #include "gss_crypto.h"
 
 #include "gss_api.h"
 #include "gss_crypto.h"
 

-static struct list_head registered_mechs = LIST_HEAD_INIT(registered_mechs);
+static LIST_HEAD(registered_mechs);

 static DEFINE_SPINLOCK(registered_mechs_lock);
 
 int lgss_mech_register(struct gss_api_mech *gm)
 static DEFINE_SPINLOCK(registered_mechs_lock);
 
 int lgss_mech_register(struct gss_api_mech *gm)

diff --git a/lustre/quota/qmt_lock.c b/lustre/quota/qmt_lock.c
index a025925..0e20f9c 100644 (file)
--- a/lustre/quota/qmt_lock.c
+++ b/lustre/quota/qmt_lock.c
@@ -499,7 +499,7 @@ static int qmt_glimpse_lock(const struct lu_env *env, struct qmt_device *qmt,
                            qmt_glimpse_cb_t cb, void *arg)
 {
        struct list_head *tmp, *pos;
                            qmt_glimpse_cb_t cb, void *arg)
 {
        struct list_head *tmp, *pos;

-       struct list_head gl_list = LIST_HEAD_INIT(gl_list);
+       LIST_HEAD(gl_list);

        struct qmt_gl_lock_array locks;
        unsigned long i;
        int rc = 0;
        struct qmt_gl_lock_array locks;
        unsigned long i;
        int rc = 0;

diff --git a/lustre/quota/qsd_config.c b/lustre/quota/qsd_config.c
index 5077861..ed3415e 100644 (file)
--- a/lustre/quota/qsd_config.c
+++ b/lustre/quota/qsd_config.c
@@ -35,7 +35,7 @@
 
 #include "qsd_internal.h"
 
 
 #include "qsd_internal.h"
 

-static struct list_head qfs_list = LIST_HEAD_INIT(qfs_list);
+static LIST_HEAD(qfs_list);

 /* protect the qfs_list */
 static DEFINE_SPINLOCK(qfs_list_lock);
 
 /* protect the qfs_list */
 static DEFINE_SPINLOCK(qfs_list_lock);