ceph: remove delay check logic from ceph_check_caps()

[sfrench/cifs-2.6.git] / fs / ceph / file.c

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 6239cff491e20c546d89169ebac255e7b26f3822..39b364a51c17ae1d4a3cb9ab8184bd71d1790e9b 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1826,7 +1826,7 @@ retry_snap:
                if (dirty)
                        __mark_inode_dirty(inode, dirty);
                if (ceph_quota_is_max_bytes_approaching(inode, iocb->ki_pos))
-                       ceph_check_caps(ci, CHECK_CAPS_NODELAY, NULL);
+                       ceph_check_caps(ci, 0, NULL);
        }
 
        dout("aio_write %p %llx.%llx %llu~%u  dropping cap refs on %s\n",
@@ -2427,15 +2427,10 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,
        inode_inc_iversion_raw(dst_inode);
 
        if (dst_off > size) {
-               int caps_flags = 0;
-
                /* Let the MDS know about dst file size change */
-               if (ceph_quota_is_max_bytes_approaching(dst_inode, dst_off))
-                       caps_flags |= CHECK_CAPS_NODELAY;
-               if (ceph_inode_set_size(dst_inode, dst_off))
-                       caps_flags |= CHECK_CAPS_AUTHONLY;
-               if (caps_flags)
-                       ceph_check_caps(dst_ci, caps_flags, NULL);
+               if (ceph_inode_set_size(dst_inode, dst_off) ||
+                   ceph_quota_is_max_bytes_approaching(dst_inode, dst_off))
+                       ceph_check_caps(dst_ci, CHECK_CAPS_AUTHONLY, NULL);
        }
        /* Mark Fw dirty */
        spin_lock(&dst_ci->i_ceph_lock);