diff for duplicates of <566D7884.5050407@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index 939ffdb..d7f481a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -100,28 +100,28 @@ index 31cd6b3..b94df54 100644 } @@ -3315,25 +3315,25 @@ static int ll_layout_fetch(struct inode *inode, struct ldlm_lock *lock) body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EPROTO; - goto out; + goto finish_request; } lmmsize = body->eadatasize; - if (lmmsize = 0) /* empty layout */ { + if (lmmsize == 0) /* empty layout */ { rc = 0; - goto out; + goto finish_request; } lmm = req_capsule_server_sized_get(&req->rq_pill, &RMF_EADATA, lmmsize); - if (lmm = NULL) { + if (lmm == NULL) { rc = -EFAULT; - goto out; + goto finish_request; } lvbdata = libcfs_kvzalloc(lmmsize, GFP_NOFS); - if (lvbdata = NULL) { + if (lvbdata == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -195,7 +195,7 @@ index 660b8ac..8d3287c 100644 +++ b/drivers/staging/lustre/lustre/llite/xattr.c @@ -390,19 +390,19 @@ getxattr_nocache: /* only detect the xattr size */ - if (size = 0) { + if (size == 0) { rc = body->eadatasize; - goto out; + goto finish_request; @@ -209,7 +209,7 @@ index 660b8ac..8d3287c 100644 + goto finish_request; } - if (body->eadatasize = 0) { + if (body->eadatasize == 0) { rc = -ENODATA; - goto out; + goto finish_request; @@ -290,7 +290,7 @@ index 920b1e9..2a76685 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -315,7 +315,7 @@ index 920b1e9..2a76685 100644 } msfs = req_capsule_server_get(&req->rq_pill, &RMF_OBD_STATFS); - if (msfs = NULL) { + if (msfs == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -329,7 +329,7 @@ index 920b1e9..2a76685 100644 class_import_put(imp); @@ -1163,7 +1163,7 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp, LUSTRE_MDS_VERSION, MDS_HSM_PROGRESS); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -338,7 +338,7 @@ index 920b1e9..2a76685 100644 mdc_pack_body(req, NULL, OBD_MD_FLRMTPERM, 0, 0, 0); @@ -1172,7 +1172,7 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp, req_hpk = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_PROGRESS); - if (req_hpk = NULL) { + if (req_hpk == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -356,7 +356,7 @@ index 920b1e9..2a76685 100644 } @@ -1197,7 +1197,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives) MDS_HSM_CT_REGISTER); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -365,7 +365,7 @@ index 920b1e9..2a76685 100644 mdc_pack_body(req, NULL, OBD_MD_FLRMTPERM, 0, 0, 0); @@ -1207,7 +1207,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives) &RMF_MDS_HSM_ARCHIVE); - if (archive_mask = NULL) { + if (archive_mask == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -390,7 +390,7 @@ index 920b1e9..2a76685 100644 req_hca = req_capsule_server_get(&req->rq_pill, &RMF_MDS_HSM_CURRENT_ACTION); - if (req_hca = NULL) { + if (req_hca == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -405,7 +405,7 @@ index 920b1e9..2a76685 100644 } @@ -1272,7 +1272,7 @@ static int mdc_ioc_hsm_ct_unregister(struct obd_import *imp) MDS_HSM_CT_UNREGISTER); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -429,7 +429,7 @@ index 920b1e9..2a76685 100644 + goto finish_request; req_hus = req_capsule_server_get(&req->rq_pill, &RMF_HSM_USER_STATE); - if (req_hus = NULL) { + if (req_hus == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -444,7 +444,7 @@ index 920b1e9..2a76685 100644 } @@ -1352,14 +1352,14 @@ static int mdc_ioc_hsm_state_set(struct obd_export *exp, req_hss = req_capsule_client_get(&req->rq_pill, &RMF_HSM_STATE_SET); - if (req_hss = NULL) { + if (req_hss == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -461,7 +461,7 @@ index 920b1e9..2a76685 100644 } @@ -1377,7 +1377,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, req = ptlrpc_request_alloc(imp, &RQF_MDS_HSM_REQUEST); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -470,7 +470,7 @@ index 920b1e9..2a76685 100644 req_capsule_set_size(&req->rq_pill, &RMF_MDS_HSM_USER_ITEM, RCL_CLIENT, @@ -1398,7 +1398,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, req_hr = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_REQUEST); - if (req_hr = NULL) { + if (req_hr == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -479,7 +479,7 @@ index 920b1e9..2a76685 100644 @@ -1406,7 +1406,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, req_hui = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_USER_ITEM); - if (req_hui = NULL) { + if (req_hui == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -488,7 +488,7 @@ index 920b1e9..2a76685 100644 hur->hur_request.hr_itemcount * sizeof(struct hsm_user_item)); @@ -1415,14 +1415,14 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, req_opaque = req_capsule_client_get(&req->rq_pill, &RMF_GENERIC_DATA); - if (req_opaque = NULL) { + if (req_opaque == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -515,7 +515,7 @@ index d6c1447..3a56fb7 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -539,7 +539,7 @@ index d6c1447..3a56fb7 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -555,7 +555,7 @@ index d6c1447..3a56fb7 100644 } @@ -1276,7 +1276,7 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli, - if (desc = NULL) { + if (desc == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -579,7 +579,7 @@ index d6c1447..3a56fb7 100644 + goto finish_request; msfs = req_capsule_server_get(&req->rq_pill, &RMF_OBD_STATFS); - if (msfs = NULL) { + if (msfs == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -600,7 +600,7 @@ index d6c1447..3a56fb7 100644 + goto finish_request; reply = req_capsule_server_get(&req->rq_pill, &RMF_OBD_ID); - if (reply = NULL) { + if (reply == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -624,7 +624,7 @@ index 5122205..150d2ec 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EFAULT; - goto out; + goto finish_request; @@ -632,7 +632,7 @@ index 5122205..150d2ec 100644 /* The log records are swabbed as they are processed */ ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA); - if (ptr = NULL) { + if (ptr == NULL) { rc = -EFAULT; - goto out; + goto finish_request; @@ -655,14 +655,14 @@ index 5122205..150d2ec 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EFAULT; - goto out; + goto finish_request; } ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA); - if (ptr = NULL) { + if (ptr == NULL) { rc = -EFAULT; - goto out; + goto finish_request; @@ -682,7 +682,7 @@ index 5122205..150d2ec 100644 + goto finish_request; hdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR); - if (hdr = NULL) { + if (hdr == NULL) { rc = -EFAULT; - goto out; + goto finish_request; diff --git a/a/content_digest b/N1/content_digest index 390f265..3b33efa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ "ref\0566ABCD9.1060404@users.sourceforge.net\0" "ref\0566D7733.1030102@users.sourceforge.net\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" - "Subject\0[PATCH 2/7] staging: lustre: Rename a jump label for ptlrpc_req_finished() calls\0" - "Date\0Sun, 13 Dec 2015 13:54:12 +0000\0" - "To\0Andreas Dilger <andreas.dilger@intel.com>" - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Oleg Drokin <oleg.drokin@intel.com> - lustre-devel@lists.lustre.org - " devel@driverdev.osuosl.org\0" - "Cc\0LKML <linux-kernel@vger.kernel.org>" - kernel-janitors@vger.kernel.org - " Julia Lawall <julia.lawall@lip6.fr>\0" + "Subject\0[lustre-devel] [PATCH 2/7] staging: lustre: Rename a jump label for ptlrpc_req_finished() calls\0" + "Date\0Sun, 13 Dec 2015 14:54:12 +0100\0" + "To\0lustre-devel@lists.lustre.org\0" "\00:1\0" "b\0" "From: Markus Elfring <elfring@users.sourceforge.net>\n" @@ -115,28 +108,28 @@ " }\n" "@@ -3315,25 +3315,25 @@ static int ll_layout_fetch(struct inode *inode, struct ldlm_lock *lock)\n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" " \t}\n" " \n" " \tlmmsize = body->eadatasize;\n" - " \tif (lmmsize = 0) /* empty layout */ {\n" + " \tif (lmmsize == 0) /* empty layout */ {\n" " \t\trc = 0;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" " \t}\n" " \n" " \tlmm = req_capsule_server_sized_get(&req->rq_pill, &RMF_EADATA, lmmsize);\n" - " \tif (lmm = NULL) {\n" + " \tif (lmm == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" " \t}\n" " \n" " \tlvbdata = libcfs_kvzalloc(lmmsize, GFP_NOFS);\n" - " \tif (lvbdata = NULL) {\n" + " \tif (lvbdata == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -210,7 +203,7 @@ "+++ b/drivers/staging/lustre/lustre/llite/xattr.c\n" "@@ -390,19 +390,19 @@ getxattr_nocache:\n" " \t\t/* only detect the xattr size */\n" - " \t\tif (size = 0) {\n" + " \t\tif (size == 0) {\n" " \t\t\trc = body->eadatasize;\n" "-\t\t\tgoto out;\n" "+\t\t\tgoto finish_request;\n" @@ -224,7 +217,7 @@ "+\t\t\tgoto finish_request;\n" " \t\t}\n" " \n" - " \t\tif (body->eadatasize = 0) {\n" + " \t\tif (body->eadatasize == 0) {\n" " \t\t\trc = -ENODATA;\n" "-\t\t\tgoto out;\n" "+\t\t\tgoto finish_request;\n" @@ -305,7 +298,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -330,7 +323,7 @@ " \t}\n" " \n" " \tmsfs = req_capsule_server_get(&req->rq_pill, &RMF_OBD_STATFS);\n" - " \tif (msfs = NULL) {\n" + " \tif (msfs == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -344,7 +337,7 @@ " \tclass_import_put(imp);\n" "@@ -1163,7 +1163,7 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp,\n" " \t\t\t\t\tLUSTRE_MDS_VERSION, MDS_HSM_PROGRESS);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -353,7 +346,7 @@ " \tmdc_pack_body(req, NULL, OBD_MD_FLRMTPERM, 0, 0, 0);\n" "@@ -1172,7 +1172,7 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp,\n" " \treq_hpk = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_PROGRESS);\n" - " \tif (req_hpk = NULL) {\n" + " \tif (req_hpk == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -371,7 +364,7 @@ " }\n" "@@ -1197,7 +1197,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives)\n" " \t\t\t\t\tMDS_HSM_CT_REGISTER);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -380,7 +373,7 @@ " \tmdc_pack_body(req, NULL, OBD_MD_FLRMTPERM, 0, 0, 0);\n" "@@ -1207,7 +1207,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives)\n" " \t\t\t\t\t &RMF_MDS_HSM_ARCHIVE);\n" - " \tif (archive_mask = NULL) {\n" + " \tif (archive_mask == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -405,7 +398,7 @@ " \n" " \treq_hca = req_capsule_server_get(&req->rq_pill,\n" " \t\t\t\t\t &RMF_MDS_HSM_CURRENT_ACTION);\n" - " \tif (req_hca = NULL) {\n" + " \tif (req_hca == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -420,7 +413,7 @@ " }\n" "@@ -1272,7 +1272,7 @@ static int mdc_ioc_hsm_ct_unregister(struct obd_import *imp)\n" " \t\t\t\t\tMDS_HSM_CT_UNREGISTER);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -444,7 +437,7 @@ "+\t\tgoto finish_request;\n" " \n" " \treq_hus = req_capsule_server_get(&req->rq_pill, &RMF_HSM_USER_STATE);\n" - " \tif (req_hus = NULL) {\n" + " \tif (req_hus == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -459,7 +452,7 @@ " }\n" "@@ -1352,14 +1352,14 @@ static int mdc_ioc_hsm_state_set(struct obd_export *exp,\n" " \treq_hss = req_capsule_client_get(&req->rq_pill, &RMF_HSM_STATE_SET);\n" - " \tif (req_hss = NULL) {\n" + " \tif (req_hss == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -476,7 +469,7 @@ " }\n" "@@ -1377,7 +1377,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,\n" " \treq = ptlrpc_request_alloc(imp, &RQF_MDS_HSM_REQUEST);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -485,7 +478,7 @@ " \treq_capsule_set_size(&req->rq_pill, &RMF_MDS_HSM_USER_ITEM, RCL_CLIENT,\n" "@@ -1398,7 +1398,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,\n" " \treq_hr = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_REQUEST);\n" - " \tif (req_hr = NULL) {\n" + " \tif (req_hr == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -494,7 +487,7 @@ " \n" "@@ -1406,7 +1406,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,\n" " \treq_hui = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_USER_ITEM);\n" - " \tif (req_hui = NULL) {\n" + " \tif (req_hui == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -503,7 +496,7 @@ " \t hur->hur_request.hr_itemcount * sizeof(struct hsm_user_item));\n" "@@ -1415,14 +1415,14 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,\n" " \treq_opaque = req_capsule_client_get(&req->rq_pill, &RMF_GENERIC_DATA);\n" - " \tif (req_opaque = NULL) {\n" + " \tif (req_opaque == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -530,7 +523,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -554,7 +547,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -570,7 +563,7 @@ " }\n" "@@ -1276,7 +1276,7 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli,\n" " \n" - " \tif (desc = NULL) {\n" + " \tif (desc == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -594,7 +587,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tmsfs = req_capsule_server_get(&req->rq_pill, &RMF_OBD_STATFS);\n" - " \tif (msfs = NULL) {\n" + " \tif (msfs == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -615,7 +608,7 @@ "+\t\t\tgoto finish_request;\n" " \n" " \t\treply = req_capsule_server_get(&req->rq_pill, &RMF_OBD_ID);\n" - " \t\tif (reply = NULL) {\n" + " \t\tif (reply == NULL) {\n" " \t\t\trc = -EPROTO;\n" "-\t\t\tgoto out;\n" "+\t\t\tgoto finish_request;\n" @@ -639,7 +632,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -647,7 +640,7 @@ " \n" " \t/* The log records are swabbed as they are processed */\n" " \tptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);\n" - " \tif (ptr = NULL) {\n" + " \tif (ptr == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -670,14 +663,14 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" " \t}\n" " \n" " \tptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);\n" - " \tif (ptr = NULL) {\n" + " \tif (ptr == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -697,7 +690,7 @@ "+\t\tgoto finish_request;\n" " \n" " \thdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR);\n" - " \tif (hdr = NULL) {\n" + " \tif (hdr == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -716,4 +709,4 @@ "-- \n" 2.6.3 -1be6e27633f69e5c5ad3519320e5d252d177cbe2fcbf8e640efe4c5d4b8bb000 +b0b3532e1d2a25dd8497b4a2085b68a0551481e331f84d9a49f525dc5eaeb874
diff --git a/a/1.txt b/N2/1.txt index 939ffdb..d7f481a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -100,28 +100,28 @@ index 31cd6b3..b94df54 100644 } @@ -3315,25 +3315,25 @@ static int ll_layout_fetch(struct inode *inode, struct ldlm_lock *lock) body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EPROTO; - goto out; + goto finish_request; } lmmsize = body->eadatasize; - if (lmmsize = 0) /* empty layout */ { + if (lmmsize == 0) /* empty layout */ { rc = 0; - goto out; + goto finish_request; } lmm = req_capsule_server_sized_get(&req->rq_pill, &RMF_EADATA, lmmsize); - if (lmm = NULL) { + if (lmm == NULL) { rc = -EFAULT; - goto out; + goto finish_request; } lvbdata = libcfs_kvzalloc(lmmsize, GFP_NOFS); - if (lvbdata = NULL) { + if (lvbdata == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -195,7 +195,7 @@ index 660b8ac..8d3287c 100644 +++ b/drivers/staging/lustre/lustre/llite/xattr.c @@ -390,19 +390,19 @@ getxattr_nocache: /* only detect the xattr size */ - if (size = 0) { + if (size == 0) { rc = body->eadatasize; - goto out; + goto finish_request; @@ -209,7 +209,7 @@ index 660b8ac..8d3287c 100644 + goto finish_request; } - if (body->eadatasize = 0) { + if (body->eadatasize == 0) { rc = -ENODATA; - goto out; + goto finish_request; @@ -290,7 +290,7 @@ index 920b1e9..2a76685 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -315,7 +315,7 @@ index 920b1e9..2a76685 100644 } msfs = req_capsule_server_get(&req->rq_pill, &RMF_OBD_STATFS); - if (msfs = NULL) { + if (msfs == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -329,7 +329,7 @@ index 920b1e9..2a76685 100644 class_import_put(imp); @@ -1163,7 +1163,7 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp, LUSTRE_MDS_VERSION, MDS_HSM_PROGRESS); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -338,7 +338,7 @@ index 920b1e9..2a76685 100644 mdc_pack_body(req, NULL, OBD_MD_FLRMTPERM, 0, 0, 0); @@ -1172,7 +1172,7 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp, req_hpk = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_PROGRESS); - if (req_hpk = NULL) { + if (req_hpk == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -356,7 +356,7 @@ index 920b1e9..2a76685 100644 } @@ -1197,7 +1197,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives) MDS_HSM_CT_REGISTER); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -365,7 +365,7 @@ index 920b1e9..2a76685 100644 mdc_pack_body(req, NULL, OBD_MD_FLRMTPERM, 0, 0, 0); @@ -1207,7 +1207,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives) &RMF_MDS_HSM_ARCHIVE); - if (archive_mask = NULL) { + if (archive_mask == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -390,7 +390,7 @@ index 920b1e9..2a76685 100644 req_hca = req_capsule_server_get(&req->rq_pill, &RMF_MDS_HSM_CURRENT_ACTION); - if (req_hca = NULL) { + if (req_hca == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -405,7 +405,7 @@ index 920b1e9..2a76685 100644 } @@ -1272,7 +1272,7 @@ static int mdc_ioc_hsm_ct_unregister(struct obd_import *imp) MDS_HSM_CT_UNREGISTER); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -429,7 +429,7 @@ index 920b1e9..2a76685 100644 + goto finish_request; req_hus = req_capsule_server_get(&req->rq_pill, &RMF_HSM_USER_STATE); - if (req_hus = NULL) { + if (req_hus == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -444,7 +444,7 @@ index 920b1e9..2a76685 100644 } @@ -1352,14 +1352,14 @@ static int mdc_ioc_hsm_state_set(struct obd_export *exp, req_hss = req_capsule_client_get(&req->rq_pill, &RMF_HSM_STATE_SET); - if (req_hss = NULL) { + if (req_hss == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -461,7 +461,7 @@ index 920b1e9..2a76685 100644 } @@ -1377,7 +1377,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, req = ptlrpc_request_alloc(imp, &RQF_MDS_HSM_REQUEST); - if (req = NULL) { + if (req == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -470,7 +470,7 @@ index 920b1e9..2a76685 100644 req_capsule_set_size(&req->rq_pill, &RMF_MDS_HSM_USER_ITEM, RCL_CLIENT, @@ -1398,7 +1398,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, req_hr = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_REQUEST); - if (req_hr = NULL) { + if (req_hr == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -479,7 +479,7 @@ index 920b1e9..2a76685 100644 @@ -1406,7 +1406,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, req_hui = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_USER_ITEM); - if (req_hui = NULL) { + if (req_hui == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -488,7 +488,7 @@ index 920b1e9..2a76685 100644 hur->hur_request.hr_itemcount * sizeof(struct hsm_user_item)); @@ -1415,14 +1415,14 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, req_opaque = req_capsule_client_get(&req->rq_pill, &RMF_GENERIC_DATA); - if (req_opaque = NULL) { + if (req_opaque == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -515,7 +515,7 @@ index d6c1447..3a56fb7 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -539,7 +539,7 @@ index d6c1447..3a56fb7 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -555,7 +555,7 @@ index d6c1447..3a56fb7 100644 } @@ -1276,7 +1276,7 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli, - if (desc = NULL) { + if (desc == NULL) { rc = -ENOMEM; - goto out; + goto finish_request; @@ -579,7 +579,7 @@ index d6c1447..3a56fb7 100644 + goto finish_request; msfs = req_capsule_server_get(&req->rq_pill, &RMF_OBD_STATFS); - if (msfs = NULL) { + if (msfs == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -600,7 +600,7 @@ index d6c1447..3a56fb7 100644 + goto finish_request; reply = req_capsule_server_get(&req->rq_pill, &RMF_OBD_ID); - if (reply = NULL) { + if (reply == NULL) { rc = -EPROTO; - goto out; + goto finish_request; @@ -624,7 +624,7 @@ index 5122205..150d2ec 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EFAULT; - goto out; + goto finish_request; @@ -632,7 +632,7 @@ index 5122205..150d2ec 100644 /* The log records are swabbed as they are processed */ ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA); - if (ptr = NULL) { + if (ptr == NULL) { rc = -EFAULT; - goto out; + goto finish_request; @@ -655,14 +655,14 @@ index 5122205..150d2ec 100644 + goto finish_request; body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY); - if (body = NULL) { + if (body == NULL) { rc = -EFAULT; - goto out; + goto finish_request; } ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA); - if (ptr = NULL) { + if (ptr == NULL) { rc = -EFAULT; - goto out; + goto finish_request; @@ -682,7 +682,7 @@ index 5122205..150d2ec 100644 + goto finish_request; hdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR); - if (hdr = NULL) { + if (hdr == NULL) { rc = -EFAULT; - goto out; + goto finish_request; diff --git a/a/content_digest b/N2/content_digest index 390f265..2cffdc1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\0566D7733.1030102@users.sourceforge.net\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" "Subject\0[PATCH 2/7] staging: lustre: Rename a jump label for ptlrpc_req_finished() calls\0" - "Date\0Sun, 13 Dec 2015 13:54:12 +0000\0" + "Date\0Sun, 13 Dec 2015 14:54:12 +0100\0" "To\0Andreas Dilger <andreas.dilger@intel.com>" Greg Kroah-Hartman <gregkh@linuxfoundation.org> Oleg Drokin <oleg.drokin@intel.com> @@ -115,28 +115,28 @@ " }\n" "@@ -3315,25 +3315,25 @@ static int ll_layout_fetch(struct inode *inode, struct ldlm_lock *lock)\n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" " \t}\n" " \n" " \tlmmsize = body->eadatasize;\n" - " \tif (lmmsize = 0) /* empty layout */ {\n" + " \tif (lmmsize == 0) /* empty layout */ {\n" " \t\trc = 0;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" " \t}\n" " \n" " \tlmm = req_capsule_server_sized_get(&req->rq_pill, &RMF_EADATA, lmmsize);\n" - " \tif (lmm = NULL) {\n" + " \tif (lmm == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" " \t}\n" " \n" " \tlvbdata = libcfs_kvzalloc(lmmsize, GFP_NOFS);\n" - " \tif (lvbdata = NULL) {\n" + " \tif (lvbdata == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -210,7 +210,7 @@ "+++ b/drivers/staging/lustre/lustre/llite/xattr.c\n" "@@ -390,19 +390,19 @@ getxattr_nocache:\n" " \t\t/* only detect the xattr size */\n" - " \t\tif (size = 0) {\n" + " \t\tif (size == 0) {\n" " \t\t\trc = body->eadatasize;\n" "-\t\t\tgoto out;\n" "+\t\t\tgoto finish_request;\n" @@ -224,7 +224,7 @@ "+\t\t\tgoto finish_request;\n" " \t\t}\n" " \n" - " \t\tif (body->eadatasize = 0) {\n" + " \t\tif (body->eadatasize == 0) {\n" " \t\t\trc = -ENODATA;\n" "-\t\t\tgoto out;\n" "+\t\t\tgoto finish_request;\n" @@ -305,7 +305,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -330,7 +330,7 @@ " \t}\n" " \n" " \tmsfs = req_capsule_server_get(&req->rq_pill, &RMF_OBD_STATFS);\n" - " \tif (msfs = NULL) {\n" + " \tif (msfs == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -344,7 +344,7 @@ " \tclass_import_put(imp);\n" "@@ -1163,7 +1163,7 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp,\n" " \t\t\t\t\tLUSTRE_MDS_VERSION, MDS_HSM_PROGRESS);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -353,7 +353,7 @@ " \tmdc_pack_body(req, NULL, OBD_MD_FLRMTPERM, 0, 0, 0);\n" "@@ -1172,7 +1172,7 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp,\n" " \treq_hpk = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_PROGRESS);\n" - " \tif (req_hpk = NULL) {\n" + " \tif (req_hpk == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -371,7 +371,7 @@ " }\n" "@@ -1197,7 +1197,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives)\n" " \t\t\t\t\tMDS_HSM_CT_REGISTER);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -380,7 +380,7 @@ " \tmdc_pack_body(req, NULL, OBD_MD_FLRMTPERM, 0, 0, 0);\n" "@@ -1207,7 +1207,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives)\n" " \t\t\t\t\t &RMF_MDS_HSM_ARCHIVE);\n" - " \tif (archive_mask = NULL) {\n" + " \tif (archive_mask == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -405,7 +405,7 @@ " \n" " \treq_hca = req_capsule_server_get(&req->rq_pill,\n" " \t\t\t\t\t &RMF_MDS_HSM_CURRENT_ACTION);\n" - " \tif (req_hca = NULL) {\n" + " \tif (req_hca == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -420,7 +420,7 @@ " }\n" "@@ -1272,7 +1272,7 @@ static int mdc_ioc_hsm_ct_unregister(struct obd_import *imp)\n" " \t\t\t\t\tMDS_HSM_CT_UNREGISTER);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -444,7 +444,7 @@ "+\t\tgoto finish_request;\n" " \n" " \treq_hus = req_capsule_server_get(&req->rq_pill, &RMF_HSM_USER_STATE);\n" - " \tif (req_hus = NULL) {\n" + " \tif (req_hus == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -459,7 +459,7 @@ " }\n" "@@ -1352,14 +1352,14 @@ static int mdc_ioc_hsm_state_set(struct obd_export *exp,\n" " \treq_hss = req_capsule_client_get(&req->rq_pill, &RMF_HSM_STATE_SET);\n" - " \tif (req_hss = NULL) {\n" + " \tif (req_hss == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -476,7 +476,7 @@ " }\n" "@@ -1377,7 +1377,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,\n" " \treq = ptlrpc_request_alloc(imp, &RQF_MDS_HSM_REQUEST);\n" - " \tif (req = NULL) {\n" + " \tif (req == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -485,7 +485,7 @@ " \treq_capsule_set_size(&req->rq_pill, &RMF_MDS_HSM_USER_ITEM, RCL_CLIENT,\n" "@@ -1398,7 +1398,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,\n" " \treq_hr = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_REQUEST);\n" - " \tif (req_hr = NULL) {\n" + " \tif (req_hr == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -494,7 +494,7 @@ " \n" "@@ -1406,7 +1406,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,\n" " \treq_hui = req_capsule_client_get(&req->rq_pill, &RMF_MDS_HSM_USER_ITEM);\n" - " \tif (req_hui = NULL) {\n" + " \tif (req_hui == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -503,7 +503,7 @@ " \t hur->hur_request.hr_itemcount * sizeof(struct hsm_user_item));\n" "@@ -1415,14 +1415,14 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,\n" " \treq_opaque = req_capsule_client_get(&req->rq_pill, &RMF_GENERIC_DATA);\n" - " \tif (req_opaque = NULL) {\n" + " \tif (req_opaque == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -530,7 +530,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -554,7 +554,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -570,7 +570,7 @@ " }\n" "@@ -1276,7 +1276,7 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli,\n" " \n" - " \tif (desc = NULL) {\n" + " \tif (desc == NULL) {\n" " \t\trc = -ENOMEM;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -594,7 +594,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tmsfs = req_capsule_server_get(&req->rq_pill, &RMF_OBD_STATFS);\n" - " \tif (msfs = NULL) {\n" + " \tif (msfs == NULL) {\n" " \t\trc = -EPROTO;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -615,7 +615,7 @@ "+\t\t\tgoto finish_request;\n" " \n" " \t\treply = req_capsule_server_get(&req->rq_pill, &RMF_OBD_ID);\n" - " \t\tif (reply = NULL) {\n" + " \t\tif (reply == NULL) {\n" " \t\t\trc = -EPROTO;\n" "-\t\t\tgoto out;\n" "+\t\t\tgoto finish_request;\n" @@ -639,7 +639,7 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -647,7 +647,7 @@ " \n" " \t/* The log records are swabbed as they are processed */\n" " \tptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);\n" - " \tif (ptr = NULL) {\n" + " \tif (ptr == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -670,14 +670,14 @@ "+\t\tgoto finish_request;\n" " \n" " \tbody = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);\n" - " \tif (body = NULL) {\n" + " \tif (body == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" " \t}\n" " \n" " \tptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);\n" - " \tif (ptr = NULL) {\n" + " \tif (ptr == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -697,7 +697,7 @@ "+\t\tgoto finish_request;\n" " \n" " \thdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR);\n" - " \tif (hdr = NULL) {\n" + " \tif (hdr == NULL) {\n" " \t\trc = -EFAULT;\n" "-\t\tgoto out;\n" "+\t\tgoto finish_request;\n" @@ -716,4 +716,4 @@ "-- \n" 2.6.3 -1be6e27633f69e5c5ad3519320e5d252d177cbe2fcbf8e640efe4c5d4b8bb000 +f858eef1bb98728b546a2b13159739f02ee24c9450a864ccb374a493ad0c1839
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.