diff options
Diffstat (limited to 'include/linux/nfsd/nfsfh.h')
| -rw-r--r-- | include/linux/nfsd/nfsfh.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index bb842ea41033..0798b7781a6e 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
| @@ -294,7 +294,7 @@ fill_post_wcc(struct svc_fh *fhp) | |||
| 294 | /* | 294 | /* |
| 295 | * Lock a file handle/inode | 295 | * Lock a file handle/inode |
| 296 | * NOTE: both fh_lock and fh_unlock are done "by hand" in | 296 | * NOTE: both fh_lock and fh_unlock are done "by hand" in |
| 297 | * vfs.c:nfsd_rename as it needs to grab 2 i_sem's at once | 297 | * vfs.c:nfsd_rename as it needs to grab 2 i_mutex's at once |
| 298 | * so, any changes here should be reflected there. | 298 | * so, any changes here should be reflected there. |
| 299 | */ | 299 | */ |
| 300 | static inline void | 300 | static inline void |
| @@ -317,7 +317,7 @@ fh_lock(struct svc_fh *fhp) | |||
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | inode = dentry->d_inode; | 319 | inode = dentry->d_inode; |
| 320 | down(&inode->i_sem); | 320 | mutex_lock(&inode->i_mutex); |
| 321 | fill_pre_wcc(fhp); | 321 | fill_pre_wcc(fhp); |
| 322 | fhp->fh_locked = 1; | 322 | fhp->fh_locked = 1; |
| 323 | } | 323 | } |
| @@ -333,7 +333,7 @@ fh_unlock(struct svc_fh *fhp) | |||
| 333 | 333 | ||
| 334 | if (fhp->fh_locked) { | 334 | if (fhp->fh_locked) { |
| 335 | fill_post_wcc(fhp); | 335 | fill_post_wcc(fhp); |
| 336 | up(&fhp->fh_dentry->d_inode->i_sem); | 336 | mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex); |
| 337 | fhp->fh_locked = 0; | 337 | fhp->fh_locked = 0; |
| 338 | } | 338 | } |
| 339 | } | 339 | } |
