diff for duplicates of <20110329032559.GF9856@bicker> diff --git a/a/1.txt b/N1/1.txt index bfadc14..3a34dd6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,12 +7,12 @@ index b6776cb..03740e8 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1672,7 +1672,7 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc, - if (req->r_sent == 0) { + if (req->r_sent = 0) { rc = __map_request(osdc, req); if (rc < 0) - return rc; + goto out_unlock; - if (req->r_osd == NULL) { + if (req->r_osd = NULL) { dout("send_request %p no up osds in pg\n", req); ceph_monc_request_next_osdmap(&osdc->client->monc); @@ -1689,6 +1689,8 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc, diff --git a/a/content_digest b/N1/content_digest index 87e0e5e..e99cc69 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch 2/2] ceph: unlock on error in ceph_osdc_start_request()\0" - "Date\0Tue, 29 Mar 2011 06:25:59 +0300\0" + "Date\0Tue, 29 Mar 2011 03:25:59 +0000\0" "To\0Sage Weil <sage@newdream.net>\0" "Cc\0ceph-devel@vger.kernel.org" " kernel-janitors@vger.kernel.org\0" @@ -15,12 +15,12 @@ "--- a/net/ceph/osd_client.c\n" "+++ b/net/ceph/osd_client.c\n" "@@ -1672,7 +1672,7 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,\n" - " \tif (req->r_sent == 0) {\n" + " \tif (req->r_sent = 0) {\n" " \t\trc = __map_request(osdc, req);\n" " \t\tif (rc < 0)\n" "-\t\t\treturn rc;\n" "+\t\t\tgoto out_unlock;\n" - " \t\tif (req->r_osd == NULL) {\n" + " \t\tif (req->r_osd = NULL) {\n" " \t\t\tdout(\"send_request %p no up osds in pg\\n\", req);\n" " \t\t\tceph_monc_request_next_osdmap(&osdc->client->monc);\n" "@@ -1689,6 +1689,8 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,\n" @@ -33,4 +33,4 @@ " \tup_read(&osdc->map_sem);\n" " \treturn rc;" -29297f359528637bc6eb31f069006a3c9aab1befdb06a5405b7981dc4d366f59 +ad26823f01761f120cfc52d0d0606ee823df2c44cf4a3ebac0bf9ee966430b1b
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.