ceph: remove CEPH_I_NOFLUSH

Nothing sets this flag.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index bb91abaf75590d8cfc14eeb1b7270962426083eb..b1c80d837d0db51696e57c4696efade1bd7796f3 100644 (file)
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2003,11 +2003,6 @@ retry_locked:
                }
 
 ack:
-               if (ci->i_ceph_flags & CEPH_I_NOFLUSH) {
-                       dout(" skipping %p I_NOFLUSH set\n", inode);
-                       continue;
-               }
-
                if (session && session != cap->session) {
                        dout("oops, wrong session %p mutex\n", session);
                        mutex_unlock(&session->s_mutex);
@@ -2105,11 +2100,6 @@ static int try_flush_caps(struct inode *inode, u64 *ptid)
 retry:
        spin_lock(&ci->i_ceph_lock);
 retry_locked:
-       if (ci->i_ceph_flags & CEPH_I_NOFLUSH) {
-               spin_unlock(&ci->i_ceph_lock);
-               dout("try_flush_caps skipping %p I_NOFLUSH set\n", inode);
-               goto out;
-       }
        if (ci->i_dirty_caps && ci->i_auth_cap) {
                struct ceph_cap *cap = ci->i_auth_cap;
                int delayed;

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index cf16308800faaa2faf4f6f7be30856a0047cd081..03e4828c76359e595fb13f7450f965c92b63147b 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -507,16 +507,15 @@ static inline struct inode *ceph_find_inode(struct super_block *sb,
 #define CEPH_I_DIR_ORDERED     (1 << 0)  /* dentries in dir are ordered */
 #define CEPH_I_NODELAY         (1 << 1)  /* do not delay cap release */
 #define CEPH_I_FLUSH           (1 << 2)  /* do not delay flush of dirty metadata */
-#define CEPH_I_NOFLUSH         (1 << 3)  /* do not flush dirty caps */
-#define CEPH_I_POOL_PERM       (1 << 4)  /* pool rd/wr bits are valid */
-#define CEPH_I_POOL_RD         (1 << 5)  /* can read from pool */
-#define CEPH_I_POOL_WR         (1 << 6)  /* can write to pool */
-#define CEPH_I_SEC_INITED      (1 << 7)  /* security initialized */
-#define CEPH_I_CAP_DROPPED     (1 << 8)  /* caps were forcibly dropped */
-#define CEPH_I_KICK_FLUSH      (1 << 9)  /* kick flushing caps */
-#define CEPH_I_FLUSH_SNAPS     (1 << 10) /* need flush snapss */
-#define CEPH_I_ERROR_WRITE     (1 << 11) /* have seen write errors */
-#define CEPH_I_ERROR_FILELOCK  (1 << 12) /* have seen file lock errors */
+#define CEPH_I_POOL_PERM       (1 << 3)  /* pool rd/wr bits are valid */
+#define CEPH_I_POOL_RD         (1 << 4)  /* can read from pool */
+#define CEPH_I_POOL_WR         (1 << 5)  /* can write to pool */
+#define CEPH_I_SEC_INITED      (1 << 6)  /* security initialized */
+#define CEPH_I_CAP_DROPPED     (1 << 7)  /* caps were forcibly dropped */
+#define CEPH_I_KICK_FLUSH      (1 << 8)  /* kick flushing caps */
+#define CEPH_I_FLUSH_SNAPS     (1 << 9) /* need flush snapss */
+#define CEPH_I_ERROR_WRITE     (1 << 10) /* have seen write errors */
+#define CEPH_I_ERROR_FILELOCK  (1 << 11) /* have seen file lock errors */
 
 
 /*