diff options
author | Jeff Layton <jlayton@poochiereds.net> | 2015-09-17 08:28:39 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2015-10-12 17:31:04 -0400 |
commit | aaf91ec148910e0c2bfd135ea19f870e7196e64f (patch) | |
tree | 0c97000244ac94b79728c8b9cba9ba81e1bec318 /fs/nfsd/nfsfh.h | |
parent | fcaba026a55803dd21523e6e191ba7f59e02a737 (diff) |
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>
Diffstat (limited to 'fs/nfsd/nfsfh.h')
-rw-r--r-- | fs/nfsd/nfsfh.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h index b1edd6bf40e1..2087bae17582 100644 --- a/fs/nfsd/nfsfh.h +++ b/fs/nfsd/nfsfh.h | |||
@@ -30,12 +30,12 @@ typedef struct svc_fh { | |||
30 | struct dentry * fh_dentry; /* validated dentry */ | 30 | struct dentry * fh_dentry; /* validated dentry */ |
31 | struct svc_export * fh_export; /* export pointer */ | 31 | struct svc_export * fh_export; /* export pointer */ |
32 | 32 | ||
33 | unsigned char fh_locked; /* inode locked by us */ | 33 | bool fh_locked; /* inode locked by us */ |
34 | unsigned char fh_want_write; /* remount protection taken */ | 34 | bool fh_want_write; /* remount protection taken */ |
35 | 35 | ||
36 | #ifdef CONFIG_NFSD_V3 | 36 | #ifdef CONFIG_NFSD_V3 |
37 | unsigned char fh_post_saved; /* post-op attrs saved */ | 37 | bool fh_post_saved; /* post-op attrs saved */ |
38 | unsigned char fh_pre_saved; /* pre-op attrs saved */ | 38 | bool fh_pre_saved; /* pre-op attrs saved */ |
39 | 39 | ||
40 | /* Pre-op attributes saved during fh_lock */ | 40 | /* Pre-op attributes saved during fh_lock */ |
41 | __u64 fh_pre_size; /* size before operation */ | 41 | __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) | |||
213 | static inline void | 213 | static inline void |
214 | fh_clear_wcc(struct svc_fh *fhp) | 214 | fh_clear_wcc(struct svc_fh *fhp) |
215 | { | 215 | { |
216 | fhp->fh_post_saved = 0; | 216 | fhp->fh_post_saved = false; |
217 | fhp->fh_pre_saved = 0; | 217 | fhp->fh_pre_saved = false; |
218 | } | 218 | } |
219 | 219 | ||
220 | /* | 220 | /* |
@@ -231,7 +231,7 @@ fill_pre_wcc(struct svc_fh *fhp) | |||
231 | fhp->fh_pre_ctime = inode->i_ctime; | 231 | fhp->fh_pre_ctime = inode->i_ctime; |
232 | fhp->fh_pre_size = inode->i_size; | 232 | fhp->fh_pre_size = inode->i_size; |
233 | fhp->fh_pre_change = inode->i_version; | 233 | fhp->fh_pre_change = inode->i_version; |
234 | fhp->fh_pre_saved = 1; | 234 | fhp->fh_pre_saved = true; |
235 | } | 235 | } |
236 | } | 236 | } |
237 | 237 | ||
@@ -267,7 +267,7 @@ fh_lock_nested(struct svc_fh *fhp, unsigned int subclass) | |||
267 | inode = d_inode(dentry); | 267 | inode = d_inode(dentry); |
268 | mutex_lock_nested(&inode->i_mutex, subclass); | 268 | mutex_lock_nested(&inode->i_mutex, subclass); |
269 | fill_pre_wcc(fhp); | 269 | fill_pre_wcc(fhp); |
270 | fhp->fh_locked = 1; | 270 | fhp->fh_locked = true; |
271 | } | 271 | } |
272 | 272 | ||
273 | static inline void | 273 | static inline void |
@@ -285,7 +285,7 @@ fh_unlock(struct svc_fh *fhp) | |||
285 | if (fhp->fh_locked) { | 285 | if (fhp->fh_locked) { |
286 | fill_post_wcc(fhp); | 286 | fill_post_wcc(fhp); |
287 | mutex_unlock(&d_inode(fhp->fh_dentry)->i_mutex); | 287 | mutex_unlock(&d_inode(fhp->fh_dentry)->i_mutex); |
288 | fhp->fh_locked = 0; | 288 | fhp->fh_locked = false; |
289 | } | 289 | } |
290 | } | 290 | } |
291 | 291 | ||