1 files changed, 28 insertions, 24 deletions

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index ae23e31a8f38..a65acf355384 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -446,19 +446,35 @@ done:
 }
 
 /*
- * Write commit callback, called if we requested both an ACK and
- * ONDISK commit reply from the OSD.
+ * Write commit request unsafe callback, called to tell us when a
+ * request is unsafe (that is, in flight--has been handed to the
+ * messenger to send to its target osd).  It is called again when
+ * we've received a response message indicating the request is
+ * "safe" (its CEPH_OSD_FLAG_ONDISK flag is set), or when a request
+ * is completed early (and unsuccessfully) due to a timeout or
+ * interrupt.
+ *
+ * This is used if we requested both an ACK and ONDISK commit reply
+ * from the OSD.
  */
-static void sync_write_commit(struct ceph_osd_request *req,
-                              struct ceph_msg *msg)
+static void ceph_sync_write_unsafe(struct ceph_osd_request *req, bool unsafe)
 {
         struct ceph_inode_info *ci = ceph_inode(req->r_inode);
 
-        dout("sync_write_commit %p tid %llu\n", req, req->r_tid);
-        spin_lock(&ci->i_unsafe_lock);
-        list_del_init(&req->r_unsafe_item);
-        spin_unlock(&ci->i_unsafe_lock);
-        ceph_put_cap_refs(ci, CEPH_CAP_FILE_WR);
+        dout("%s %p tid %llu %ssafe\n", __func__, req, req->r_tid,
+                unsafe ? "un" : "");
+        if (unsafe) {
+                ceph_get_cap_refs(ci, CEPH_CAP_FILE_WR);
+                spin_lock(&ci->i_unsafe_lock);
+                list_add_tail(&req->r_unsafe_item,
+                              &ci->i_unsafe_writes);
+                spin_unlock(&ci->i_unsafe_lock);
+        } else {
+                spin_lock(&ci->i_unsafe_lock);
+                list_del_init(&req->r_unsafe_item);
+                spin_unlock(&ci->i_unsafe_lock);
+                ceph_put_cap_refs(ci, CEPH_CAP_FILE_WR);
+        }
 }
 
 /*
@@ -570,7 +586,8 @@ more:
 
                 if ((file->f_flags & O_SYNC) == 0) {
                         /* get a second commit callback */
-                        req->r_safe_callback = sync_write_commit;
+                        req->r_unsafe_callback = ceph_sync_write_unsafe;
+                        req->r_inode = inode;
                         own_pages = true;
                 }
         }
@@ -581,21 +598,8 @@ more:
         ceph_osdc_build_request(req, pos, snapc, vino.snap, &mtime);
 
         ret = ceph_osdc_start_request(&fsc->client->osdc, req, false);
-        if (!ret) {
-                if (req->r_safe_callback) {
-                        /*
-                         * Add to inode unsafe list only after we
-                         * start_request so that a tid has been assigned.
-                         */
-                        spin_lock(&ci->i_unsafe_lock);
-                        list_add_tail(&req->r_unsafe_item,
-                                      &ci->i_unsafe_writes);
-                        spin_unlock(&ci->i_unsafe_lock);
-                        ceph_get_cap_refs(ci, CEPH_CAP_FILE_WR);
-                }
-                
+        if (!ret)
                 ret = ceph_osdc_wait_request(&fsc->client->osdc, req);
-        }
 
         if (file->f_flags & O_DIRECT)
                 ceph_put_page_vector(pages, num_pages, false);