3 files changed, 20 insertions, 11 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index eb0a46a49bd4..dd9b5857ef5c 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -290,7 +290,7 @@ int ceph_msgr_init(void)
         if (ceph_msgr_slab_init())
                 return -ENOMEM;
 
-        ceph_msgr_wq = alloc_workqueue("ceph-msgr", WQ_NON_REENTRANT, 0);
+        ceph_msgr_wq = alloc_workqueue("ceph-msgr", 0, 0);
         if (ceph_msgr_wq)
                 return 0;
 
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index dd47889adc4a..1606f740d6ae 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -503,7 +503,9 @@ void osd_req_op_extent_init(struct ceph_osd_request *osd_req,
         struct ceph_osd_req_op *op = _osd_req_op_init(osd_req, which, opcode);
         size_t payload_len = 0;
 
-        BUG_ON(opcode != CEPH_OSD_OP_READ && opcode != CEPH_OSD_OP_WRITE);
+        BUG_ON(opcode != CEPH_OSD_OP_READ && opcode != CEPH_OSD_OP_WRITE &&
+               opcode != CEPH_OSD_OP_DELETE && opcode != CEPH_OSD_OP_ZERO &&
+               opcode != CEPH_OSD_OP_TRUNCATE);
 
         op->extent.offset = offset;
         op->extent.length = length;
@@ -631,6 +633,9 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req,
                 break;
         case CEPH_OSD_OP_READ:
         case CEPH_OSD_OP_WRITE:
+        case CEPH_OSD_OP_ZERO:
+        case CEPH_OSD_OP_DELETE:
+        case CEPH_OSD_OP_TRUNCATE:
                 if (src->op == CEPH_OSD_OP_WRITE)
                         request_data_len = src->extent.length;
                 dst->extent.offset = cpu_to_le64(src->extent.offset);
@@ -715,7 +720,9 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
         u64 object_base;
         int r;
 
-        BUG_ON(opcode != CEPH_OSD_OP_READ && opcode != CEPH_OSD_OP_WRITE);
+        BUG_ON(opcode != CEPH_OSD_OP_READ && opcode != CEPH_OSD_OP_WRITE &&
+               opcode != CEPH_OSD_OP_DELETE && opcode != CEPH_OSD_OP_ZERO &&
+               opcode != CEPH_OSD_OP_TRUNCATE);
 
         req = ceph_osdc_alloc_request(osdc, snapc, num_ops, use_mempool,
                                         GFP_NOFS);
@@ -1488,14 +1495,14 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
         dout("handle_reply %p tid %llu req %p result %d\n", msg, tid,
              req, result);
 
-        ceph_decode_need(&p, end, 4, bad);
+        ceph_decode_need(&p, end, 4, bad_put);
         numops = ceph_decode_32(&p);
         if (numops > CEPH_OSD_MAX_OP)
                 goto bad_put;
         if (numops != req->r_num_ops)
                 goto bad_put;
         payload_len = 0;
-        ceph_decode_need(&p, end, numops * sizeof(struct ceph_osd_op), bad);
+        ceph_decode_need(&p, end, numops * sizeof(struct ceph_osd_op), bad_put);
         for (i = 0; i < numops; i++) {
                 struct ceph_osd_op *op = p;
                 int len;
@@ -1513,7 +1520,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
                 goto bad_put;
         }
 
-        ceph_decode_need(&p, end, 4 + numops * 4, bad);
+        ceph_decode_need(&p, end, 4 + numops * 4, bad_put);
         retry_attempt = ceph_decode_32(&p);
         for (i = 0; i < numops; i++)
                 req->r_reply_op_result[i] = ceph_decode_32(&p);
@@ -1786,6 +1793,8 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)
                 nr_maps--;
         }
 
+        if (!osdc->osdmap)
+                goto bad;
 done:
         downgrade_write(&osdc->map_sem);
         ceph_monc_got_osdmap(&osdc->client->monc, osdc->osdmap->epoch);
@@ -2129,6 +2138,8 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
                         dout("osdc_start_request failed map, "
                                 " will retry %lld\n", req->r_tid);
                         rc = 0;
+                } else {
+                        __unregister_request(osdc, req);
                 }
                 goto out_unlock;
         }
@@ -2253,12 +2264,10 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client)
         if (err < 0)
                 goto out_msgpool;
 
+        err = -ENOMEM;
         osdc->notify_wq = create_singlethread_workqueue("ceph-watch-notify");
-        if (IS_ERR(osdc->notify_wq)) {
-                err = PTR_ERR(osdc->notify_wq);
-                osdc->notify_wq = NULL;
+        if (!osdc->notify_wq)
                 goto out_msgpool;
-        }
         return 0;
 
 out_msgpool:
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index 603ddd92db19..dbd9a4792427 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -1129,7 +1129,7 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
 
         /* pg_temp? */
         pgid.seed = ceph_stable_mod(pgid.seed, pool->pg_num,
-                                    pool->pgp_num_mask);
+                                    pool->pg_num_mask);
         pg = __lookup_pg_mapping(&osdmap->pg_temp, pgid);
         if (pg) {
                 *num = pg->len;