Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24d063ac authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: make sure flushsnap messages are sent in proper order 



Before sending new flushsnap message, check if there are old
flushsnap messages that need to be re-sent. If there are, re-send
old messages first. This guarantees ordering of flushsnap messages.

Signed-off-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent a5cd74ad

fs/ceph/caps.c

+7 −5
Original line number Diff line number Diff line
@@ -1457,6 +1457,12 @@ void ceph_flush_snaps(struct ceph_inode_info *ci, 
		goto retry;

	}



	// make sure flushsnap messages are sent in proper order.

	if (ci->i_ceph_flags & CEPH_I_KICK_FLUSH) {

		__kick_flushing_caps(mdsc, session, ci, 0);

		ci->i_ceph_flags &= ~CEPH_I_KICK_FLUSH;

	}



	__ceph_flush_snaps(ci, session);

out:

	spin_unlock(&ci->i_ceph_lock);
@@ -1904,11 +1910,7 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags, 
		    (ci->i_ceph_flags &

		     (CEPH_I_KICK_FLUSH | CEPH_I_FLUSH_SNAPS))) {

			if (ci->i_ceph_flags & CEPH_I_KICK_FLUSH) {

				spin_lock(&mdsc->cap_dirty_lock);

				oldest_flush_tid = __get_oldest_flush_tid(mdsc);

				spin_unlock(&mdsc->cap_dirty_lock);

				__kick_flushing_caps(mdsc, session, ci,

						     oldest_flush_tid);

				__kick_flushing_caps(mdsc, session, ci, 0);

				ci->i_ceph_flags &= ~CEPH_I_KICK_FLUSH;

			}

			if (ci->i_ceph_flags & CEPH_I_FLUSH_SNAPS)