Subject: linux-next: manual merge of the ceph tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 6 Nov 2023 09:24:08 +1100

Hi all,

Today's linux-next merge of the ceph tree got a conflict in:

  fs/ceph/inode.c

between commit:

  c453bdb53534 ("ceph: convert to new timestamp accessors")

from Linus' tree and commit:

  38d46409c463 ("ceph: print cluster fsid and client global_id in all debug logs")

from the ceph tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ceph/inode.c
index 2e2a303b9e64,b1b92a948a3b..000000000000
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@@ -833,33 -847,29 +847,32 @@@ void ceph_fill_file_time(struct inode *
  		if (ci->i_version == 0 ||
  		    ceph_seq_cmp(time_warp_seq, ci->i_time_warp_seq) > 0) {
  			/* the MDS did a utimes() */
- 			dout("mtime %lld.%09ld -> %lld.%09ld "
- 			     "tw %d -> %d\n",
- 			     inode_get_mtime_sec(inode),
- 			     inode_get_mtime_nsec(inode),
- 			     mtime->tv_sec, mtime->tv_nsec,
- 			     ci->i_time_warp_seq, (int)time_warp_seq);
+ 			doutc(cl, "mtime %lld.%09ld -> %lld.%09ld tw %d -> %d\n",
 -			      inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec,
++			      inode_get_mtime_sec(inode),
++			      inode_get_mtime_nsec(inode),
+ 			      mtime->tv_sec, mtime->tv_nsec,
+ 			      ci->i_time_warp_seq, (int)time_warp_seq);
  
 -			inode->i_mtime = *mtime;
 -			inode->i_atime = *atime;
 +			inode_set_mtime_to_ts(inode, *mtime);
 +			inode_set_atime_to_ts(inode, *atime);
  			ci->i_time_warp_seq = time_warp_seq;
  		} else if (time_warp_seq == ci->i_time_warp_seq) {
 +			struct timespec64	ts;
 +
  			/* nobody did utimes(); take the max */
 -			if (timespec64_compare(mtime, &inode->i_mtime) > 0) {
 +			ts = inode_get_mtime(inode);
 +			if (timespec64_compare(mtime, &ts) > 0) {
- 				dout("mtime %lld.%09ld -> %lld.%09ld inc\n",
- 				     ts.tv_sec, ts.tv_nsec,
- 				     mtime->tv_sec, mtime->tv_nsec);
+ 				doutc(cl, "mtime %lld.%09ld -> %lld.%09ld inc\n",
 -				      inode->i_mtime.tv_sec,
 -				      inode->i_mtime.tv_nsec,
++				      ts.tv_sec, ts.tv_nsec,
+ 				      mtime->tv_sec, mtime->tv_nsec);
 -				inode->i_mtime = *mtime;
 +				inode_set_mtime_to_ts(inode, *mtime);
  			}
 -			if (timespec64_compare(atime, &inode->i_atime) > 0) {
 +			ts = inode_get_atime(inode);
 +			if (timespec64_compare(atime, &ts) > 0) {
- 				dout("atime %lld.%09ld -> %lld.%09ld inc\n",
- 				     ts.tv_sec, ts.tv_nsec,
- 				     atime->tv_sec, atime->tv_nsec);
+ 				doutc(cl, "atime %lld.%09ld -> %lld.%09ld inc\n",
 -				      inode->i_atime.tv_sec,
 -				      inode->i_atime.tv_nsec,
++				      ts.tv_sec, ts.tv_nsec,
+ 				      atime->tv_sec, atime->tv_nsec);
 -				inode->i_atime = *atime;
 +				inode_set_atime_to_ts(inode, *atime);
  			}
  		} else if (issued & CEPH_CAP_FILE_EXCL) {
  			/* we did a utimes(); ignore mds values */
@@@ -2554,22 -2595,21 +2598,22 @@@ retry
  	}
  
  	if (ia_valid & ATTR_ATIME) {
 +		struct timespec64 atime = inode_get_atime(inode);
 +
- 		dout("setattr %p atime %lld.%ld -> %lld.%ld\n", inode,
- 		     atime.tv_sec, atime.tv_nsec,
- 		     attr->ia_atime.tv_sec, attr->ia_atime.tv_nsec);
+ 		doutc(cl, "%p %llx.%llx atime %lld.%ld -> %lld.%ld\n",
 -		      inode, ceph_vinop(inode), inode->i_atime.tv_sec,
 -		      inode->i_atime.tv_nsec, attr->ia_atime.tv_sec,
 -		      attr->ia_atime.tv_nsec);
++		      inode, ceph_vinop(inode), atime.tv_sec, atime.tv_nsec,
++		      attr->ia_atime.tv_sec, attr->ia_atime.tv_nsec);
  		if (issued & CEPH_CAP_FILE_EXCL) {
  			ci->i_time_warp_seq++;
 -			inode->i_atime = attr->ia_atime;
 +			inode_set_atime_to_ts(inode, attr->ia_atime);
  			dirtied |= CEPH_CAP_FILE_EXCL;
  		} else if ((issued & CEPH_CAP_FILE_WR) &&
 -			   timespec64_compare(&inode->i_atime,
 -					    &attr->ia_atime) < 0) {
 -			inode->i_atime = attr->ia_atime;
 +			   timespec64_compare(&atime,
 +					      &attr->ia_atime) < 0) {
 +			inode_set_atime_to_ts(inode, attr->ia_atime);
  			dirtied |= CEPH_CAP_FILE_WR;
  		} else if ((issued & CEPH_CAP_FILE_SHARED) == 0 ||
 -			   !timespec64_equal(&inode->i_atime, &attr->ia_atime)) {
 +			   !timespec64_equal(&atime, &attr->ia_atime)) {
  			ceph_encode_timespec64(&req->r_args.setattr.atime,
  					       &attr->ia_atime);
  			mask |= CEPH_SETATTR_ATIME;
@@@ -2629,21 -2670,21 +2674,21 @@@
  		}
  	}
  	if (ia_valid & ATTR_MTIME) {
 +		struct timespec64 mtime = inode_get_mtime(inode);
 +
- 		dout("setattr %p mtime %lld.%ld -> %lld.%ld\n", inode,
- 		     mtime.tv_sec, mtime.tv_nsec,
- 		     attr->ia_mtime.tv_sec, attr->ia_mtime.tv_nsec);
+ 		doutc(cl, "%p %llx.%llx mtime %lld.%ld -> %lld.%ld\n",
 -		      inode, ceph_vinop(inode), inode->i_mtime.tv_sec,
 -		      inode->i_mtime.tv_nsec, attr->ia_mtime.tv_sec,
 -		      attr->ia_mtime.tv_nsec);
++		      inode, ceph_vinop(inode), mtime.tv_sec, mtime.tv_nsec,
++		      attr->ia_mtime.tv_sec, attr->ia_mtime.tv_nsec);
  		if (issued & CEPH_CAP_FILE_EXCL) {
  			ci->i_time_warp_seq++;
 -			inode->i_mtime = attr->ia_mtime;
 +			inode_set_mtime_to_ts(inode, attr->ia_mtime);
  			dirtied |= CEPH_CAP_FILE_EXCL;
  		} else if ((issued & CEPH_CAP_FILE_WR) &&
 -			   timespec64_compare(&inode->i_mtime,
 -					    &attr->ia_mtime) < 0) {
 -			inode->i_mtime = attr->ia_mtime;
 +			   timespec64_compare(&mtime, &attr->ia_mtime) < 0) {
 +			inode_set_mtime_to_ts(inode, attr->ia_mtime);
  			dirtied |= CEPH_CAP_FILE_WR;
  		} else if ((issued & CEPH_CAP_FILE_SHARED) == 0 ||
 -			   !timespec64_equal(&inode->i_mtime, &attr->ia_mtime)) {
 +			   !timespec64_equal(&mtime, &attr->ia_mtime)) {
  			ceph_encode_timespec64(&req->r_args.setattr.mtime,
  					       &attr->ia_mtime);
  			mask |= CEPH_SETATTR_MTIME;
@@@ -2656,11 -2697,12 +2701,12 @@@
  	if (ia_valid & ATTR_CTIME) {
  		bool only = (ia_valid & (ATTR_SIZE|ATTR_MTIME|ATTR_ATIME|
  					 ATTR_MODE|ATTR_UID|ATTR_GID)) == 0;
- 		dout("setattr %p ctime %lld.%ld -> %lld.%ld (%s)\n", inode,
- 		     inode_get_ctime_sec(inode),
- 		     inode_get_ctime_nsec(inode),
- 		     attr->ia_ctime.tv_sec, attr->ia_ctime.tv_nsec,
- 		     only ? "ctime only" : "ignored");
+ 		doutc(cl, "%p %llx.%llx ctime %lld.%ld -> %lld.%ld (%s)\n",
 -		      inode, ceph_vinop(inode), inode_get_ctime(inode).tv_sec,
 -		      inode_get_ctime(inode).tv_nsec,
++		      inode, ceph_vinop(inode), inode_get_ctime_sec(inode),
++		      inode_get_ctime_nsec(inode),
+ 		      attr->ia_ctime.tv_sec, attr->ia_ctime.tv_nsec,
+ 		      only ? "ctime only" : "ignored");
+ 
  		if (only) {
  			/*
  			 * if kernel wants to dirty ctime but nothing else,