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

Commit d8672d64 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: fix update of ctime from MDS 



The client can have a newer ctime than the MDS due to AUTH_EXCL and
XATTR_EXCL caps as well; update the check in ceph_fill_file_time
appropriately.

This fixes cases where ctime/mtime goes backward under the right sequence
of local updates (e.g. chmod) and mds replies (e.g. subsequent stat that
goes to the MDS).

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 8bd59e01

fs/ceph/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -471,7 +471,9 @@ void ceph_fill_file_time(struct inode *inode, int issued, 


	if (issued & (CEPH_CAP_FILE_EXCL|

		      CEPH_CAP_FILE_WR|

		      CEPH_CAP_FILE_BUFFER)) {

		      CEPH_CAP_FILE_BUFFER|

		      CEPH_CAP_AUTH_EXCL|

		      CEPH_CAP_XATTR_EXCL)) {

		if (timespec_compare(ctime, &inode->i_ctime) > 0) {

			dout("ctime %ld.%09ld -> %ld.%09ld inc w/ cap\n",

			     inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,
@@ -511,7 +513,7 @@ void ceph_fill_file_time(struct inode *inode, int issued, 
			warn = 1;

		}

	} else {

		/* we have no write caps; whatever the MDS says is true */

		/* we have no write|excl caps; whatever the MDS says is true */

		if (ceph_seq_cmp(time_warp_seq, ci->i_time_warp_seq) >= 0) {

			inode->i_ctime = *ctime;

			inode->i_mtime = *mtime;