Commit f67eef8d authored by Jeff Layton's avatar Jeff Layton Committed by Chuck Lever
Browse files

nfsd: drop inode parameter from nfsd4_change_attribute() 



The inode that nfs4_open_delegation() passes to this function is
wrong, which throws off the result. The inode will end up getting a
directory-style change attr instead of a regular-file-style one.

Fix up nfs4_delegation_stat() to fetch STATX_MODE, and then drop the
inode parameter from nfsd4_change_attribute(), since it's no longer
needed.

Fixes: c5967721 ("NFSD: handle GETATTR conflict with write delegation")
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent ac159338

fs/nfsd/nfs4state.c

+2 −3
Original line number Diff line number Diff line
@@ -5957,7 +5957,7 @@ nfs4_delegation_stat(struct nfs4_delegation *dp, struct svc_fh *currentfh, 
	path.dentry = file_dentry(nf->nf_file);



	rc = vfs_getattr(&path, stat,

			 (STATX_SIZE | STATX_CTIME | STATX_CHANGE_COOKIE),

			 (STATX_MODE | STATX_SIZE | STATX_CTIME | STATX_CHANGE_COOKIE),

			 AT_STATX_SYNC_AS_STAT);



	nfsd_file_put(nf);
@@ -6041,8 +6041,7 @@ nfs4_open_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp, 
		}

		open->op_delegate_type = NFS4_OPEN_DELEGATE_WRITE;

		dp->dl_cb_fattr.ncf_cur_fsize = stat.size;

		dp->dl_cb_fattr.ncf_initial_cinfo =

			nfsd4_change_attribute(&stat, d_inode(currentfh->fh_dentry));

		dp->dl_cb_fattr.ncf_initial_cinfo = nfsd4_change_attribute(&stat);

		trace_nfsd_deleg_write(&dp->dl_stid.sc_stateid);

	} else {

		open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -3040,7 +3040,7 @@ static __be32 nfsd4_encode_fattr4_change(struct xdr_stream *xdr, 
		return nfs_ok;

	}



	c = nfsd4_change_attribute(&args->stat, d_inode(args->dentry));

	c = nfsd4_change_attribute(&args->stat);

	return nfsd4_encode_changeid4(xdr, c);

}

fs/nfsd/nfsfh.c

+12 −8
Original line number Diff line number Diff line
@@ -667,20 +667,18 @@ fh_update(struct svc_fh *fhp) 
__be32 __must_check fh_fill_pre_attrs(struct svc_fh *fhp)

{

	bool v4 = (fhp->fh_maxsize == NFS4_FHSIZE);

	struct inode *inode;

	struct kstat stat;

	__be32 err;



	if (fhp->fh_no_wcc || fhp->fh_pre_saved)

		return nfs_ok;



	inode = d_inode(fhp->fh_dentry);

	err = fh_getattr(fhp, &stat);

	if (err)

		return err;



	if (v4)

		fhp->fh_pre_change = nfsd4_change_attribute(&stat, inode);

		fhp->fh_pre_change = nfsd4_change_attribute(&stat);



	fhp->fh_pre_mtime = stat.mtime;

	fhp->fh_pre_ctime = stat.ctime;
@@ -697,7 +695,6 @@ __be32 __must_check fh_fill_pre_attrs(struct svc_fh *fhp) 
__be32 fh_fill_post_attrs(struct svc_fh *fhp)

{

	bool v4 = (fhp->fh_maxsize == NFS4_FHSIZE);

	struct inode *inode = d_inode(fhp->fh_dentry);

	__be32 err;



	if (fhp->fh_no_wcc)
@@ -713,7 +710,7 @@ __be32 fh_fill_post_attrs(struct svc_fh *fhp) 
	fhp->fh_post_saved = true;

	if (v4)

		fhp->fh_post_change =

			nfsd4_change_attribute(&fhp->fh_post_attr, inode);

			nfsd4_change_attribute(&fhp->fh_post_attr);

	return nfs_ok;

}
@@ -804,7 +801,14 @@ enum fsid_source fsid_source(const struct svc_fh *fhp) 
	return FSIDSOURCE_DEV;

}



/*

/**

 * nfsd4_change_attribute - Generate an NFSv4 change_attribute value

 * @stat: inode attributes

 *

 * Caller must fill in @stat before calling, typically by invoking

 * vfs_getattr() with STATX_MODE, STATX_CTIME, and STATX_CHANGE_COOKIE.

 * Returns an unsigned 64-bit changeid4 value (RFC 8881 Section 3.2).

 *

 * We could use i_version alone as the change attribute.  However, i_version

 * can go backwards on a regular file after an unclean shutdown.  On its own

 * that doesn't necessarily cause a problem, but if i_version goes backwards
@@ -821,13 +825,13 @@ enum fsid_source fsid_source(const struct svc_fh *fhp) 
 * assume that the new change attr is always logged to stable storage in some

 * fashion before the results can be seen.

 */

u64 nfsd4_change_attribute(const struct kstat *stat, const struct inode *inode)

u64 nfsd4_change_attribute(const struct kstat *stat)

{

	u64 chattr;



	if (stat->result_mask & STATX_CHANGE_COOKIE) {

		chattr = stat->change_cookie;

		if (S_ISREG(inode->i_mode) &&

		if (S_ISREG(stat->mode) &&

		    !(stat->attributes & STATX_ATTR_CHANGE_MONOTONIC)) {

			chattr += (u64)stat->ctime.tv_sec << 30;

			chattr += stat->ctime.tv_nsec;

fs/nfsd/nfsfh.h

+1 −2
Original line number Diff line number Diff line
@@ -297,8 +297,7 @@ static inline void fh_clear_pre_post_attrs(struct svc_fh *fhp) 
	fhp->fh_pre_saved = false;

}



u64 nfsd4_change_attribute(const struct kstat *stat,

			   const struct inode *inode);

u64 nfsd4_change_attribute(const struct kstat *stat);

__be32 __must_check fh_fill_pre_attrs(struct svc_fh *fhp);

__be32 fh_fill_post_attrs(struct svc_fh *fhp);

__be32 __must_check fh_fill_both_attrs(struct svc_fh *fhp);