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

Commit aaf91ec1 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: switch unsigned char flags in svc_fh to bools 



...just for clarity.

Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent fcaba026

fs/nfsd/nfs3xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -262,11 +262,11 @@ void fill_post_wcc(struct svc_fh *fhp) 
	err = fh_getattr(fhp, &fhp->fh_post_attr);

	fhp->fh_post_change = d_inode(fhp->fh_dentry)->i_version;

	if (err) {

		fhp->fh_post_saved = 0;

		fhp->fh_post_saved = false;

		/* Grab the ctime anyway - set_change_info might use it */

		fhp->fh_post_attr.ctime = d_inode(fhp->fh_dentry)->i_ctime;

	} else

		fhp->fh_post_saved = 1;

		fhp->fh_post_saved = true;

}



/*

fs/nfsd/nfsfh.c

+1 −4
Original line number Diff line number Diff line
@@ -631,10 +631,7 @@ fh_put(struct svc_fh *fhp) 
		fh_unlock(fhp);

		fhp->fh_dentry = NULL;

		dput(dentry);

#ifdef CONFIG_NFSD_V3

		fhp->fh_pre_saved = 0;

		fhp->fh_post_saved = 0;

#endif

		fh_clear_wcc(fhp);

	}

	fh_drop_write(fhp);

	if (exp) {

fs/nfsd/nfsfh.h

+9 −9
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ typedef struct svc_fh { 
	struct dentry *		fh_dentry;	/* validated dentry */

	struct svc_export *	fh_export;	/* export pointer */



	unsigned char		fh_locked;	/* inode locked by us */

	unsigned char		fh_want_write;	/* remount protection taken */

	bool			fh_locked;	/* inode locked by us */

	bool			fh_want_write;	/* remount protection taken */



#ifdef CONFIG_NFSD_V3

	unsigned char		fh_post_saved;	/* post-op attrs saved */

	unsigned char		fh_pre_saved;	/* pre-op attrs saved */

	bool			fh_post_saved;	/* post-op attrs saved */

	bool			fh_pre_saved;	/* pre-op attrs saved */



	/* Pre-op attributes saved during fh_lock */

	__u64			fh_pre_size;	/* size before operation */
@@ -213,8 +213,8 @@ static inline bool fh_fsid_match(struct knfsd_fh *fh1, struct knfsd_fh *fh2) 
static inline void

fh_clear_wcc(struct svc_fh *fhp)

{

	fhp->fh_post_saved = 0;

	fhp->fh_pre_saved = 0;

	fhp->fh_post_saved = false;

	fhp->fh_pre_saved = false;

}



/*
@@ -231,7 +231,7 @@ fill_pre_wcc(struct svc_fh *fhp) 
		fhp->fh_pre_ctime = inode->i_ctime;

		fhp->fh_pre_size  = inode->i_size;

		fhp->fh_pre_change = inode->i_version;

		fhp->fh_pre_saved = 1;

		fhp->fh_pre_saved = true;

	}

}
@@ -267,7 +267,7 @@ fh_lock_nested(struct svc_fh *fhp, unsigned int subclass) 
	inode = d_inode(dentry);

	mutex_lock_nested(&inode->i_mutex, subclass);

	fill_pre_wcc(fhp);

	fhp->fh_locked = 1;

	fhp->fh_locked = true;

}



static inline void
@@ -285,7 +285,7 @@ fh_unlock(struct svc_fh *fhp) 
	if (fhp->fh_locked) {

		fill_post_wcc(fhp);

		mutex_unlock(&d_inode(fhp->fh_dentry)->i_mutex);

		fhp->fh_locked = 0;

		fhp->fh_locked = false;

	}

}

fs/nfsd/vfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1631,7 +1631,7 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, 
	/* cannot use fh_lock as we need deadlock protective ordering

	 * so do it by hand */

	trap = lock_rename(tdentry, fdentry);

	ffhp->fh_locked = tfhp->fh_locked = 1;

	ffhp->fh_locked = tfhp->fh_locked = true;

	fill_pre_wcc(ffhp);

	fill_pre_wcc(tfhp);
@@ -1681,7 +1681,7 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, 
	fill_post_wcc(ffhp);

	fill_post_wcc(tfhp);

	unlock_rename(tdentry, fdentry);

	ffhp->fh_locked = tfhp->fh_locked = 0;

	ffhp->fh_locked = tfhp->fh_locked = false;

	fh_drop_write(ffhp);



out:

fs/nfsd/vfs.h

+2 −2
Original line number Diff line number Diff line
@@ -112,14 +112,14 @@ static inline int fh_want_write(struct svc_fh *fh) 
	int ret = mnt_want_write(fh->fh_export->ex_path.mnt);



	if (!ret)

		fh->fh_want_write = 1;

		fh->fh_want_write = true;

	return ret;

}



static inline void fh_drop_write(struct svc_fh *fh)

{

	if (fh->fh_want_write) {

		fh->fh_want_write = 0;

		fh->fh_want_write = false;

		mnt_drop_write(fh->fh_export->ex_path.mnt);

	}

}