Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull ceph updates from Sage Weil:
 "The big item here is support for inline data for CephFS and for
  message signatures from Zheng.  There are also several bug fixes,
  including interrupted flock request handling, 0-length xattrs, mksnap,
  cached readdir results, and a message version compat field.  Finally
  there are several cleanups from Ilya, Dan, and Markus.

  Note that there is another series coming soon that fixes some bugs in
  the RBD 'lingering' requests, but it isn't quite ready yet"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (27 commits)
  ceph: fix setting empty extended attribute
  ceph: fix mksnap crash
  ceph: do_sync is never initialized
  libceph: fixup includes in pagelist.h
  ceph: support inline data feature
  ceph: flush inline version
  ceph: convert inline data to normal data before data write
  ceph: sync read inline data
  ceph: fetch inline data when getting Fcr cap refs
  ceph: use getattr request to fetch inline data
  ceph: add inline data to pagecache
  ceph: parse inline data in MClientReply and MClientCaps
  libceph: specify position of extent operation
  libceph: add CREATE osd operation support
  libceph: add SETXATTR/CMPXATTR osd operations support
  rbd: don't treat CEPH_OSD_OP_DELETE as extent op
  ceph: remove unused stringification macros
  libceph: require cephx message signature by default
  ceph: introduce global empty snap context
  ceph: message versioning fixes
  ...

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 27b71a0b72d0..3ec85dfce124 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2370,8 +2370,12 @@ static void rbd_img_obj_request_fill(struct rbd_obj_request *obj_request,
                 opcode = CEPH_OSD_OP_READ;
         }
 
-        osd_req_op_extent_init(osd_request, num_ops, opcode, offset, length,
-                                0, 0);
+        if (opcode == CEPH_OSD_OP_DELETE)
+                osd_req_op_init(osd_request, num_ops, opcode);
+        else
+                osd_req_op_extent_init(osd_request, num_ops, opcode,
+                                       offset, length, 0, 0);
+
         if (obj_request->type == OBJ_REQUEST_BIO)
                 osd_req_op_extent_osd_data_bio(osd_request, num_ops,
                                         obj_request->bio_list, length);
@@ -3405,8 +3409,7 @@ err_rq:
         if (result)
                 rbd_warn(rbd_dev, "%s %llx at %llx result %d",
                          obj_op_name(op_type), length, offset, result);
-        if (snapc)
-                ceph_put_snap_context(snapc);
+        ceph_put_snap_context(snapc);
         blk_end_request_all(rq, result);
 }