|
@@ -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;
|
|
|
}
|
|
|
}
|
|
|
|