ceph: wait unsafe sync writes for evicting inode

Otherwise ceph_sync_write_unsafe() may access/modify freed inode.

Signed-off-by: Yan, Zheng <zyan@redhat.com>

1 files changed, 2 insertions, 48 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index a08d245f16f5..1e48377f18a7 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1928,53 +1928,6 @@ static int caps_are_flushed(struct inode *inode, u64 flush_tid)
 }
 
 /*
- * Wait on any unsafe replies for the given inode.  First wait on the
- * newest request, and make that the upper bound.  Then, if there are
- * more requests, keep waiting on the oldest as long as it is still older
- * than the original request.
- */
-static void sync_write_wait(struct inode *inode)
-{
-        struct ceph_inode_info *ci = ceph_inode(inode);
-        struct list_head *head = &ci->i_unsafe_writes;
-        struct ceph_osd_request *req;
-        u64 last_tid;
-
-        if (!S_ISREG(inode->i_mode))
-                return;
-
-        spin_lock(&ci->i_unsafe_lock);
-        if (list_empty(head))
-                goto out;
-
-        /* set upper bound as _last_ entry in chain */
-        req = list_last_entry(head, struct ceph_osd_request,
-                              r_unsafe_item);
-        last_tid = req->r_tid;
-
-        do {
-                ceph_osdc_get_request(req);
-                spin_unlock(&ci->i_unsafe_lock);
-                dout("sync_write_wait on tid %llu (until %llu)\n",
-                     req->r_tid, last_tid);
-                wait_for_completion(&req->r_safe_completion);
-                spin_lock(&ci->i_unsafe_lock);
-                ceph_osdc_put_request(req);
-
-                /*
-                 * from here on look at first entry in chain, since we
-                 * only want to wait for anything older than last_tid
-                 */
-                if (list_empty(head))
-                        break;
-                req = list_first_entry(head, struct ceph_osd_request,
-                                       r_unsafe_item);
-        } while (req->r_tid < last_tid);
-out:
-        spin_unlock(&ci->i_unsafe_lock);
-}
-
-/*
  * wait for any unsafe requests to complete.
  */
 static int unsafe_request_wait(struct inode *inode)
@@ -2026,7 +1979,8 @@ int ceph_fsync(struct file *file, loff_t start, loff_t end, int datasync)
         int dirty;
 
         dout("fsync %p%s\n", inode, datasync ? " datasync" : "");
-        sync_write_wait(inode);
+
+        ceph_sync_write_wait(inode);
 
         ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
         if (ret < 0)