UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd: switch unsigned char flags in svc_fh to bools 

...just for clarity.

Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Jeff Layton 2015-09-17 08:28:39 -04:00 committed by J. Bruce Fields
parent fcaba026a5
commit aaf91ec148
6 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfs3xdr.c
View File

@ -262,11 +262,11 @@ void fill_post_wcc(struct svc_fh *fhp)
err = fh_getattr(fhp, &fhp->fh_post_attr); err = fh_getattr(fhp, &fhp->fh_post_attr);
fhp->fh_post_change = d_inode(fhp->fh_dentry)->i_version; fhp->fh_post_change = d_inode(fhp->fh_dentry)->i_version;
if (err) { if (err) {
fhp->fh_post_saved = 0; fhp->fh_post_saved = false;
/* Grab the ctime anyway - set_change_info might use it */ /* Grab the ctime anyway - set_change_info might use it */
fhp->fh_post_attr.ctime = d_inode(fhp->fh_dentry)->i_ctime; fhp->fh_post_attr.ctime = d_inode(fhp->fh_dentry)->i_ctime;
} else } else
fhp->fh_post_saved = 1; fhp->fh_post_saved = true;
} }
/* /*

5
fs/nfsd/nfsfh.c
View File

@ -631,10 +631,7 @@ fh_put(struct svc_fh *fhp)
fh_unlock(fhp); fh_unlock(fhp);
fhp->fh_dentry = NULL; fhp->fh_dentry = NULL;
dput(dentry); dput(dentry);
#ifdef CONFIG_NFSD_V3 fh_clear_wcc(fhp);
fhp->fh_pre_saved = 0;
fhp->fh_post_saved = 0;
#endif
} }
fh_drop_write(fhp); fh_drop_write(fhp);
if (exp) { if (exp) {

18
fs/nfsd/nfsfh.h
View File

@ -30,12 +30,12 @@ typedef struct svc_fh {
struct dentry * fh_dentry; /* validated dentry */ struct dentry * fh_dentry; /* validated dentry */
struct svc_export * fh_export; /* export pointer */ struct svc_export * fh_export; /* export pointer */
unsigned char fh_locked; /* inode locked by us */ bool fh_locked; /* inode locked by us */
unsigned char fh_want_write; /* remount protection taken */ bool fh_want_write; /* remount protection taken */
#ifdef CONFIG_NFSD_V3 #ifdef CONFIG_NFSD_V3
unsigned char fh_post_saved; /* post-op attrs saved */ bool fh_post_saved; /* post-op attrs saved */
unsigned char fh_pre_saved; /* pre-op attrs saved */ bool fh_pre_saved; /* pre-op attrs saved */
/* Pre-op attributes saved during fh_lock */ /* Pre-op attributes saved during fh_lock */
__u64 fh_pre_size; /* size before operation */ __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 static inline void
fh_clear_wcc(struct svc_fh *fhp) fh_clear_wcc(struct svc_fh *fhp)
{ {
fhp->fh_post_saved = 0; fhp->fh_post_saved = false;
fhp->fh_pre_saved = 0; 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_ctime = inode->i_ctime;
fhp->fh_pre_size = inode->i_size; fhp->fh_pre_size = inode->i_size;
fhp->fh_pre_change = inode->i_version; 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); inode = d_inode(dentry);
mutex_lock_nested(&inode->i_mutex, subclass); mutex_lock_nested(&inode->i_mutex, subclass);
fill_pre_wcc(fhp); fill_pre_wcc(fhp);
fhp->fh_locked = 1; fhp->fh_locked = true;
} }
static inline void static inline void
@ -285,7 +285,7 @@ fh_unlock(struct svc_fh *fhp)
if (fhp->fh_locked) { if (fhp->fh_locked) {
fill_post_wcc(fhp); fill_post_wcc(fhp);
mutex_unlock(&d_inode(fhp->fh_dentry)->i_mutex); mutex_unlock(&d_inode(fhp->fh_dentry)->i_mutex);
fhp->fh_locked = 0; fhp->fh_locked = false;
} }
} }

4
fs/nfsd/vfs.c
View File

@ -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 /* cannot use fh_lock as we need deadlock protective ordering
* so do it by hand */ * so do it by hand */
trap = lock_rename(tdentry, fdentry); 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(ffhp);
fill_pre_wcc(tfhp); 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(ffhp);
fill_post_wcc(tfhp); fill_post_wcc(tfhp);
unlock_rename(tdentry, fdentry); unlock_rename(tdentry, fdentry);
ffhp->fh_locked = tfhp->fh_locked = 0; ffhp->fh_locked = tfhp->fh_locked = false;
fh_drop_write(ffhp); fh_drop_write(ffhp);
out: out:

4
fs/nfsd/vfs.h
View File

@ -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); int ret = mnt_want_write(fh->fh_export->ex_path.mnt);
if (!ret) if (!ret)
fh->fh_want_write = 1; fh->fh_want_write = true;
return ret; return ret;
} }
static inline void fh_drop_write(struct svc_fh *fh) static inline void fh_drop_write(struct svc_fh *fh)
{ {
if (fh->fh_want_write) { if (fh->fh_want_write) {
fh->fh_want_write = 0; fh->fh_want_write = false;
mnt_drop_write(fh->fh_export->ex_path.mnt); mnt_drop_write(fh->fh_export->ex_path.mnt);
} }
} }

2
fs/nfsd/xdr4.h
View File

@ -632,7 +632,7 @@ static inline void
set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp) set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp)
{ {
BUG_ON(!fhp->fh_pre_saved); BUG_ON(!fhp->fh_pre_saved);
cinfo->atomic = fhp->fh_post_saved; cinfo->atomic = (u32)fhp->fh_post_saved;
cinfo->change_supported = IS_I_VERSION(d_inode(fhp->fh_dentry)); cinfo->change_supported = IS_I_VERSION(d_inode(fhp->fh_dentry));
cinfo->before_change = fhp->fh_pre_change; cinfo->before_change = fhp->fh_pre_change;