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

Pull Ceph updates from Sage Weil:
 "There is some follow-on RBD cleanup after the last window's code drop,
  a series from Yan fixing multi-mds behavior in cephfs, and then a
  sprinkling of bug fixes all around.  Some warnings, sleeping while
  atomic, a null dereference, and cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (36 commits)
  libceph: fix invalid unsigned->signed conversion for timespec encoding
  libceph: call r_unsafe_callback when unsafe reply is received
  ceph: fix race between cap issue and revoke
  ceph: fix cap revoke race
  ceph: fix pending vmtruncate race
  ceph: avoid accessing invalid memory
  libceph: Fix NULL pointer dereference in auth client code
  ceph: Reconstruct the func ceph_reserve_caps.
  ceph: Free mdsc if alloc mdsc->mdsmap failed.
  ceph: remove sb_start/end_write in ceph_aio_write.
  ceph: avoid meaningless calling ceph_caps_revoking if sync_mode == WB_SYNC_ALL.
  ceph: fix sleeping function called from invalid context.
  ceph: move inode to proper flushing list when auth MDS changes
  rbd: fix a couple warnings
  ceph: clear migrate seq when MDS restarts
  ceph: check migrate seq before changing auth cap
  ceph: fix race between page writeback and truncate
  ceph: reset iov_len when discarding cap release messages
  ceph: fix cap release race
  libceph: fix truncate size calculation
  ...

2 files changed, 38 insertions, 31 deletions

diff --git a/net/ceph/auth_none.c b/net/ceph/auth_none.c
index 925ca583c09c..8c93fa8d81bc 100644
--- a/net/ceph/auth_none.c
+++ b/net/ceph/auth_none.c
@@ -39,6 +39,11 @@ static int should_authenticate(struct ceph_auth_client *ac)
         return xi->starting;
 }
 
+static int build_request(struct ceph_auth_client *ac, void *buf, void *end)
+{
+        return 0;
+}
+
 /*
  * the generic auth code decode the global_id, and we carry no actual
  * authenticate state, so nothing happens here.
@@ -106,6 +111,7 @@ static const struct ceph_auth_client_ops ceph_auth_none_ops = {
         .destroy = destroy,
         .is_authenticated = is_authenticated,
         .should_authenticate = should_authenticate,
+        .build_request = build_request,
         .handle_reply = handle_reply,
         .create_authorizer = ceph_auth_none_create_authorizer,
         .destroy_authorizer = ceph_auth_none_destroy_authorizer,
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 3a246a6cab47..dd47889adc4a 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -733,12 +733,14 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
 
         object_size = le32_to_cpu(layout->fl_object_size);
         object_base = off - objoff;
-        if (truncate_size <= object_base) {
-                truncate_size = 0;
-        } else {
-                truncate_size -= object_base;
-                if (truncate_size > object_size)
-                        truncate_size = object_size;
+        if (!(truncate_seq == 1 && truncate_size == -1ULL)) {
+                if (truncate_size <= object_base) {
+                        truncate_size = 0;
+                } else {
+                        truncate_size -= object_base;
+                        if (truncate_size > object_size)
+                                truncate_size = object_size;
+                }
         }
 
         osd_req_op_extent_init(req, 0, opcode, objoff, objlen,
@@ -1174,6 +1176,7 @@ static void __register_linger_request(struct ceph_osd_client *osdc,
                                     struct ceph_osd_request *req)
 {
         dout("__register_linger_request %p\n", req);
+        ceph_osdc_get_request(req);
         list_add_tail(&req->r_linger_item, &osdc->req_linger);
         if (req->r_osd)
                 list_add_tail(&req->r_linger_osd,
@@ -1196,6 +1199,7 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc,
                 if (list_empty(&req->r_osd_item))
                         req->r_osd = NULL;
         }
+        ceph_osdc_put_request(req);
 }
 
 void ceph_osdc_unregister_linger_request(struct ceph_osd_client *osdc,
@@ -1203,9 +1207,8 @@ void ceph_osdc_unregister_linger_request(struct ceph_osd_client *osdc,
 {
         mutex_lock(&osdc->request_mutex);
         if (req->r_linger) {
-                __unregister_linger_request(osdc, req);
                 req->r_linger = 0;
-                ceph_osdc_put_request(req);
+                __unregister_linger_request(osdc, req);
         }
         mutex_unlock(&osdc->request_mutex);
 }
@@ -1217,11 +1220,6 @@ void ceph_osdc_set_request_linger(struct ceph_osd_client *osdc,
         if (!req->r_linger) {
                 dout("set_request_linger %p\n", req);
                 req->r_linger = 1;
-                /*
-                 * caller is now responsible for calling
-                 * unregister_linger_request
-                 */
-                ceph_osdc_get_request(req);
         }
 }
 EXPORT_SYMBOL(ceph_osdc_set_request_linger);
@@ -1339,10 +1337,6 @@ static void __send_request(struct ceph_osd_client *osdc,
 
         ceph_msg_get(req->r_request); /* send consumes a ref */
 
-        /* Mark the request unsafe if this is the first timet's being sent. */
-
-        if (!req->r_sent && req->r_unsafe_callback)
-                req->r_unsafe_callback(req, true);
         req->r_sent = req->r_osd->o_incarnation;
 
         ceph_con_send(&req->r_osd->o_con, req->r_request);
@@ -1433,8 +1427,6 @@ static void handle_osds_timeout(struct work_struct *work)
 
 static void complete_request(struct ceph_osd_request *req)
 {
-        if (req->r_unsafe_callback)
-                req->r_unsafe_callback(req, false);
         complete_all(&req->r_safe_completion);  /* fsync waiter */
 }
 
@@ -1526,6 +1518,8 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
         for (i = 0; i < numops; i++)
                 req->r_reply_op_result[i] = ceph_decode_32(&p);
 
+        already_completed = req->r_got_reply;
+
         if (!req->r_got_reply) {
 
                 req->r_result = result;
@@ -1556,19 +1550,23 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg,
             ((flags & CEPH_OSD_FLAG_WRITE) == 0))
                 __unregister_request(osdc, req);
 
-        already_completed = req->r_completed;
-        req->r_completed = 1;
         mutex_unlock(&osdc->request_mutex);
-        if (already_completed)
-                goto done;
 
-        if (req->r_callback)
-                req->r_callback(req, msg);
-        else
-                complete_all(&req->r_completion);
+        if (!already_completed) {
+                if (req->r_unsafe_callback &&
+                    result >= 0 && !(flags & CEPH_OSD_FLAG_ONDISK))
+                        req->r_unsafe_callback(req, true);
+                if (req->r_callback)
+                        req->r_callback(req, msg);
+                else
+                        complete_all(&req->r_completion);
+        }
 
-        if (flags & CEPH_OSD_FLAG_ONDISK)
+        if (flags & CEPH_OSD_FLAG_ONDISK) {
+                if (req->r_unsafe_callback && already_completed)
+                        req->r_unsafe_callback(req, false);
                 complete_request(req);
+        }
 
 done:
         dout("req=%p req->r_linger=%d\n", req, req->r_linger);
@@ -1633,8 +1631,10 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
                         dout("%p tid %llu restart on osd%d\n",
                              req, req->r_tid,
                              req->r_osd ? req->r_osd->o_osd : -1);
+                        ceph_osdc_get_request(req);
                         __unregister_request(osdc, req);
                         __register_linger_request(osdc, req);
+                        ceph_osdc_put_request(req);
                         continue;
                 }
 
@@ -2123,7 +2123,6 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
         __register_request(osdc, req);
         req->r_sent = 0;
         req->r_got_reply = 0;
-        req->r_completed = 0;
         rc = __map_request(osdc, req, 0);
         if (rc < 0) {
                 if (nofail) {
@@ -2456,8 +2455,10 @@ static struct ceph_msg *get_reply(struct ceph_connection *con,
         ceph_msg_revoke_incoming(req->r_reply);
 
         if (front > req->r_reply->front.iov_len) {
-                pr_warning("get_reply front %d > preallocated %d\n",
-                           front, (int)req->r_reply->front.iov_len);
+                pr_warning("get_reply front %d > preallocated %d (%u#%llu)\n",
+                           front, (int)req->r_reply->front.iov_len,
+                           (unsigned int)con->peer_name.type,
+                           le64_to_cpu(con->peer_name.num));
                 m = ceph_msg_new(CEPH_MSG_OSD_OPREPLY, front, GFP_NOFS, false);
                 if (!m)
                         goto out;