linux-next: manual merge of the nfsd tree with the cel-fixes tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  fs/nfsd/vfs.c

between commit:

  00801cd92d91 ("NFSD: fix regression with setting ACLs.")

from the cel-fixes tree and commit:

  e9de96c3df55 ("NFSD: Refactor nfsd_setattr()")

from the nfsd tree.

I fixed it up (I think - 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/nfsd/vfs.c
index 19f28c33e44d,8eda499de545..000000000000
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@@ -343,6 -339,44 +343,48 @@@ nfsd_get_write_access(struct svc_rqst *
  	return nfserrno(get_write_access(inode));
  }
  
+ static int __nfsd_setattr(struct dentry *dentry, struct iattr *iap)
+ {
+ 	int host_err;
+ 
+ 	if (iap->ia_valid & ATTR_SIZE) {
+ 		/*
+ 		 * RFC5661, Section 18.30.4:
+ 		 *   Changing the size of a file with SETATTR indirectly
+ 		 *   changes the time_modify and change attributes.
+ 		 *
+ 		 * (and similar for the older RFCs)
+ 		 */
+ 		struct iattr size_attr = {
+ 			.ia_valid	= ATTR_SIZE | ATTR_CTIME | ATTR_MTIME,
+ 			.ia_size	= iap->ia_size,
+ 		};
+ 
+ 		if (iap->ia_size < 0)
+ 			return -EFBIG;
+ 
+ 		host_err = notify_change(&init_user_ns, dentry, &size_attr, NULL);
+ 		if (host_err)
+ 			return host_err;
+ 		iap->ia_valid &= ~ATTR_SIZE;
+ 
+ 		/*
+ 		 * Avoid the additional setattr call below if the only other
+ 		 * attribute that the client sends is the mtime, as we update
+ 		 * it as part of the size change above.
+ 		 */
+ 		if ((iap->ia_valid & ~ATTR_MTIME) == 0)
+ 			return 0;
+ 	}
+ 
 -	iap->ia_valid |= ATTR_CTIME;
 -	return notify_change(&init_user_ns, dentry, iap, NULL);
++	if (iap->ia_valid) {
++		iap->ia_valid |= ATTR_CTIME;
++		return notify_change(&init_user_ns, dentry, iap, NULL);
++	}
++
++	return 0;
+ }
+ 
  /*
   * Set various file attributes.  After this call fhp needs an fh_put.
   */
@@@ -357,9 -391,10 +399,10 @@@ nfsd_setattr(struct svc_rqst *rqstp, st
  	int		accmode = NFSD_MAY_SATTR;
  	umode_t		ftype = 0;
  	__be32		err;
 -	int		host_err;
 +	int		host_err = 0;
  	bool		get_write_count;
  	bool		size_change = (iap->ia_valid & ATTR_SIZE);
+ 	int		retries;
  
  	if (iap->ia_valid & ATTR_SIZE) {
  		accmode |= NFSD_MAY_WRITE|NFSD_MAY_OWNER_OVERRIDE;

Attachment: pgpGstmWiXe1C.pgp
Description: OpenPGP digital signature