diff for duplicates of <D1703976.EF0A5%andreas.dilger@intel.com> diff --git a/a/1.txt b/N1/1.txt index 88e2b5c..b49d0db 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,7 +76,7 @@ Cheers, Andreas >+ int peer_port; >+ int secure = (int)((long_ptr_t)arg); > -> LASSERT(lnet_acceptor_state.pta_sock = NULL); +> LASSERT(lnet_acceptor_state.pta_sock == NULL); > >@@ -444,7 +444,7 @@ accept2secure(const char *acc, long *sec) > int @@ -122,7 +122,7 @@ Cheers, Andreas >+ int i; >+ struct list_head *hash; > -> LASSERT(the_lnet.ln_remote_nets_hash = NULL); +> LASSERT(the_lnet.ln_remote_nets_hash == NULL); > LASSERT(the_lnet.ln_remote_nets_hbits > 0); >@@ -273,8 +273,8 @@ static void lnet_assert_wire_constants(void) > static lnd_t * @@ -163,7 +163,7 @@ Cheers, Andreas >+ struct list_head *el; >+ int count; > -> if (fl->fl_nobjs = 0) +> if (fl->fl_nobjs == 0) > return; >@@ -441,7 +441,7 @@ lnet_res_type2str(int type) > static void @@ -172,7 +172,7 @@ Cheers, Andreas >- int count = 0; >+ int count = 0; > -> if (rec->rec_type = 0) /* not set yet, it's uninitialized */ +> if (rec->rec_type == 0) /* not set yet, it's uninitialized */ > return; >@@ -486,8 +486,8 @@ static int > lnet_res_container_setup(struct lnet_res_container *rec, @@ -183,7 +183,7 @@ Cheers, Andreas >+ int rc = 0; >+ int i; > -> LASSERT(rec->rec_type = 0); +> LASSERT(rec->rec_type == 0); > >@@ -525,8 +525,8 @@ out: > static void @@ -211,7 +211,7 @@ Cheers, Andreas >+ int i; > > recs = cfs_percpt_alloc(lnet_cpt_table(), sizeof(*rec)); -> if (recs = NULL) { +> if (recs == NULL) { >@@ -564,9 +564,9 @@ lnet_libhandle_t * > lnet_res_lh_lookup(struct lnet_res_container *rec, __u64 cookie) > { @@ -244,7 +244,7 @@ Cheers, Andreas >- int rc = 0; >+ int rc = 0; > -> LASSERT(the_lnet.ln_refcount = 0); +> LASSERT(the_lnet.ln_refcount == 0); > >@@ -725,8 +725,8 @@ lnet_unprepare(void) > lnet_ni_t * @@ -277,7 +277,7 @@ Cheers, Andreas >+ int cpt; >+ int cpt2; > -> if (LNET_CPT_NUMBER = 1) +> if (LNET_CPT_NUMBER == 1) > return 0; /* the only one */ >@@ -821,8 +821,8 @@ EXPORT_SYMBOL(lnet_cpt_of_nid); > int @@ -533,7 +533,7 @@ Cheers, Andreas >+ sigset_t blocked; > > if (n_ids <= 0 || -> id.nid = LNET_NID_ANY || +> id.nid == LNET_NID_ANY || >diff --git a/drivers/staging/lustre/lnet/lnet/config.c >b/drivers/staging/lustre/lnet/lnet/config.c >index 2dc4c4a..70bc809 100644 @@ -665,7 +665,7 @@ Cheers, Andreas >+ int len2 = strlen(sep2 + 1); > struct lnet_text_buf_t *ltb; > -> LASSERT(*sep1 = '['); +> LASSERT(*sep1 == '['); >@@ -500,18 +500,18 @@ lnet_expand1tb(struct list_head *list, > static int > lnet_str2tbs_expand(struct list_head *tbs, char *str) @@ -707,7 +707,7 @@ Cheers, Andreas >+ int nob = len; > > return (sscanf(str, "%u%n", hops, &nob) >= 1 && -> nob = len && +> nob == len && >@@ -597,9 +597,9 @@ lnet_parse_hops(char *str, unsigned int *hops) > static int > lnet_parse_priority(char *str, unsigned int *priority, char **token) @@ -719,7 +719,7 @@ Cheers, Andreas >+ int len; > > sep = strchr(str, LNET_PRIORITY_SEPARATOR); -> if (sep = NULL) { +> if (sep == NULL) { >@@ -628,23 +628,23 @@ static int > lnet_parse_route(char *str, int *im_a_router) > { @@ -848,7 +848,7 @@ Cheers, Andreas >+ __u32 net; > > LASSERT(!list_empty(nets)); -> LASSERT(nets->next = nets->prev); /* single entry */ +> LASSERT(nets->next == nets->prev); /* single entry */ >@@ -986,22 +986,22 @@ lnet_splitnets(char *source, struct list_head *nets) > static int > lnet_match_networks(char **networksp, char *ip2nets, __u32 *ipaddrs, int @@ -1025,7 +1025,7 @@ Cheers, Andreas >+ wait_queue_t wl; >+ unsigned long now; > -> if (tms = 0) +> if (tms == 0) > return -1; /* don't want to wait and no new event */ >@@ -392,9 +392,9 @@ int > LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, int timeout_ms, diff --git a/a/content_digest b/N1/content_digest index 38b92cb..a149e57 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01430913775-28350-1-git-send-email-shuey@purdue.edu\0" "From\0Dilger, Andreas <andreas.dilger@intel.com>\0" "Subject\0Re: [HPDD-discuss] [PATCH] staging: lustre: code cleanup - variable declaration spacing\0" - "Date\0Thu, 07 May 2015 03:36:05 +0000\0" + "Date\0Thu, 7 May 2015 03:36:05 +0000\0" "To\0Mike Shuey <shuey@purdue.edu>" Drokin " Oleg <oleg.drokin@intel.com>\0" @@ -90,7 +90,7 @@ ">+\tint peer_port;\n" ">+\tint secure = (int)((long_ptr_t)arg);\n" "> \n" - "> \tLASSERT(lnet_acceptor_state.pta_sock = NULL);\n" + "> \tLASSERT(lnet_acceptor_state.pta_sock == NULL);\n" "> \n" ">@@ -444,7 +444,7 @@ accept2secure(const char *acc, long *sec)\n" "> int\n" @@ -136,7 +136,7 @@ ">+\tint i;\n" ">+\tstruct list_head *hash;\n" "> \n" - "> \tLASSERT(the_lnet.ln_remote_nets_hash = NULL);\n" + "> \tLASSERT(the_lnet.ln_remote_nets_hash == NULL);\n" "> \tLASSERT(the_lnet.ln_remote_nets_hbits > 0);\n" ">@@ -273,8 +273,8 @@ static void lnet_assert_wire_constants(void)\n" "> static lnd_t *\n" @@ -177,7 +177,7 @@ ">+\tstruct list_head *el;\n" ">+\tint count;\n" "> \n" - "> \tif (fl->fl_nobjs = 0)\n" + "> \tif (fl->fl_nobjs == 0)\n" "> \t\treturn;\n" ">@@ -441,7 +441,7 @@ lnet_res_type2str(int type)\n" "> static void\n" @@ -186,7 +186,7 @@ ">-\tint\tcount = 0;\n" ">+\tint count = 0;\n" "> \n" - "> \tif (rec->rec_type = 0) /* not set yet, it's uninitialized */\n" + "> \tif (rec->rec_type == 0) /* not set yet, it's uninitialized */\n" "> \t\treturn;\n" ">@@ -486,8 +486,8 @@ static int\n" "> lnet_res_container_setup(struct lnet_res_container *rec,\n" @@ -197,7 +197,7 @@ ">+\tint rc = 0;\n" ">+\tint i;\n" "> \n" - "> \tLASSERT(rec->rec_type = 0);\n" + "> \tLASSERT(rec->rec_type == 0);\n" "> \n" ">@@ -525,8 +525,8 @@ out:\n" "> static void\n" @@ -225,7 +225,7 @@ ">+\tint i;\n" "> \n" "> \trecs = cfs_percpt_alloc(lnet_cpt_table(), sizeof(*rec));\n" - "> \tif (recs = NULL) {\n" + "> \tif (recs == NULL) {\n" ">@@ -564,9 +564,9 @@ lnet_libhandle_t *\n" "> lnet_res_lh_lookup(struct lnet_res_container *rec, __u64 cookie)\n" "> {\n" @@ -258,7 +258,7 @@ ">-\tint\t\t\t rc = 0;\n" ">+\tint rc = 0;\n" "> \n" - "> \tLASSERT(the_lnet.ln_refcount = 0);\n" + "> \tLASSERT(the_lnet.ln_refcount == 0);\n" "> \n" ">@@ -725,8 +725,8 @@ lnet_unprepare(void)\n" "> lnet_ni_t *\n" @@ -291,7 +291,7 @@ ">+\tint cpt;\n" ">+\tint cpt2;\n" "> \n" - "> \tif (LNET_CPT_NUMBER = 1)\n" + "> \tif (LNET_CPT_NUMBER == 1)\n" "> \t\treturn 0; /* the only one */\n" ">@@ -821,8 +821,8 @@ EXPORT_SYMBOL(lnet_cpt_of_nid);\n" "> int\n" @@ -547,7 +547,7 @@ ">+\tsigset_t blocked;\n" "> \n" "> \tif (n_ids <= 0 ||\n" - "> \t id.nid = LNET_NID_ANY ||\n" + "> \t id.nid == LNET_NID_ANY ||\n" ">diff --git a/drivers/staging/lustre/lnet/lnet/config.c\n" ">b/drivers/staging/lustre/lnet/lnet/config.c\n" ">index 2dc4c4a..70bc809 100644\n" @@ -679,7 +679,7 @@ ">+\tint len2 = strlen(sep2 + 1);\n" "> \tstruct lnet_text_buf_t *ltb;\n" "> \n" - "> \tLASSERT(*sep1 = '[');\n" + "> \tLASSERT(*sep1 == '[');\n" ">@@ -500,18 +500,18 @@ lnet_expand1tb(struct list_head *list,\n" "> static int\n" "> lnet_str2tbs_expand(struct list_head *tbs, char *str)\n" @@ -721,7 +721,7 @@ ">+\tint nob = len;\n" "> \n" "> \treturn (sscanf(str, \"%u%n\", hops, &nob) >= 1 &&\n" - "> \t\tnob = len &&\n" + "> \t\tnob == len &&\n" ">@@ -597,9 +597,9 @@ lnet_parse_hops(char *str, unsigned int *hops)\n" "> static int\n" "> lnet_parse_priority(char *str, unsigned int *priority, char **token)\n" @@ -733,7 +733,7 @@ ">+\tint len;\n" "> \n" "> \tsep = strchr(str, LNET_PRIORITY_SEPARATOR);\n" - "> \tif (sep = NULL) {\n" + "> \tif (sep == NULL) {\n" ">@@ -628,23 +628,23 @@ static int\n" "> lnet_parse_route(char *str, int *im_a_router)\n" "> {\n" @@ -862,7 +862,7 @@ ">+\t__u32 net;\n" "> \n" "> \tLASSERT(!list_empty(nets));\n" - "> \tLASSERT(nets->next = nets->prev); /* single entry */\n" + "> \tLASSERT(nets->next == nets->prev); /* single entry */\n" ">@@ -986,22 +986,22 @@ lnet_splitnets(char *source, struct list_head *nets)\n" "> static int\n" "> lnet_match_networks(char **networksp, char *ip2nets, __u32 *ipaddrs, int\n" @@ -1039,7 +1039,7 @@ ">+\twait_queue_t wl;\n" ">+\tunsigned long now;\n" "> \n" - "> \tif (tms = 0)\n" + "> \tif (tms == 0)\n" "> \t\treturn -1; /* don't want to wait and no new event */\n" ">@@ -392,9 +392,9 @@ int\n" "> LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, int timeout_ms,\n" @@ -1071,4 +1071,4 @@ "Lustre Software Architect\n" Intel High Performance Data Division -dcb9a8aac899701407ee497875dd34568b66d59f96dcc2a12082f402d8c599cf +012f8a03d59e62c71370dacbe092bcad90c5129d6579a1d415cf0ba24f692783
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.