ceph: remove CEPH_I_NOFLUSH (daca8bda) · Commits · 戴 / test

fs/ceph/caps.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -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;

fs/ceph/super.h

+9 −10

Original line number	Diff line number	Diff line
		@@ -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 */


		/*

Admin message