2 files changed, 17 insertions, 1 deletions

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index ff9e9255745c..09514d9d8a97 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1148,6 +1148,8 @@ struct ceph_osd_req_op *rbd_osd_req_op_create(u16 opcode, ...)
                 if (opcode == CEPH_OSD_OP_WRITE)
                         op->payload_len = op->extent.length;
                 break;
+        case CEPH_OSD_OP_STAT:
+                break;
         case CEPH_OSD_OP_CALL:
                 /* rbd_osd_req_op_create(CALL, class, method, data, datalen) */
                 op->cls.class_name = va_arg(args, char *);
@@ -1277,6 +1279,16 @@ static void rbd_osd_write_callback(struct rbd_obj_request *obj_request,
         obj_request_done_set(obj_request);
 }
 
+/*
+ * For a simple stat call there's nothing to do.  We'll do more if
+ * this is part of a write sequence for a layered image.
+ */
+static void rbd_osd_stat_callback(struct rbd_obj_request *obj_request,
+                                struct ceph_osd_op *op)
+{
+        obj_request_done_set(obj_request);
+}
+
 static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,
                                 struct ceph_msg *msg)
 {
@@ -1307,6 +1319,9 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,
         case CEPH_OSD_OP_WRITE:
                 rbd_osd_write_callback(obj_request, op);
                 break;
+        case CEPH_OSD_OP_STAT:
+                rbd_osd_stat_callback(obj_request, op);
+                break;
         case CEPH_OSD_OP_CALL:
         case CEPH_OSD_OP_NOTIFY_ACK:
         case CEPH_OSD_OP_WATCH:
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index b58748ec405d..39629b66f3b1 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -220,6 +220,8 @@ static void osd_req_encode_op(struct ceph_osd_request *req,
         dst->op = cpu_to_le16(src->op);
 
         switch (src->op) {
+        case CEPH_OSD_OP_STAT:
+                break;
         case CEPH_OSD_OP_READ:
         case CEPH_OSD_OP_WRITE:
                 dst->extent.offset =
@@ -255,7 +257,6 @@ static void osd_req_encode_op(struct ceph_osd_request *req,
                 pr_err("unrecognized osd opcode %d\n", dst->op);
                 WARN_ON(1);
                 break;
-        case CEPH_OSD_OP_STAT:
         case CEPH_OSD_OP_MAPEXT:
         case CEPH_OSD_OP_MASKTRUNC:
         case CEPH_OSD_OP_SPARSE_READ: