git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
linux
/
nfsd
/
nfsfh.h
diff --git
a/include/linux/nfsd/nfsfh.h
b/include/linux/nfsd/nfsfh.h
index
bb842ea
..
0798b77
100644
(file)
--- a/
include/linux/nfsd/nfsfh.h
+++ b/
include/linux/nfsd/nfsfh.h
@@
-294,7
+294,7
@@
fill_post_wcc(struct svc_fh *fhp)
/*
* Lock a file handle/inode
* NOTE: both fh_lock and fh_unlock are done "by hand" in
/*
* Lock a file handle/inode
* NOTE: both fh_lock and fh_unlock are done "by hand" in
- * vfs.c:nfsd_rename as it needs to grab 2 i_
sem
's at once
+ * vfs.c:nfsd_rename as it needs to grab 2 i_
mutex
's at once
* so, any changes here should be reflected there.
*/
static inline void
* so, any changes here should be reflected there.
*/
static inline void
@@
-317,7
+317,7
@@
fh_lock(struct svc_fh *fhp)
}
inode = dentry->d_inode;
}
inode = dentry->d_inode;
-
down(&inode->i_sem
);
+
mutex_lock(&inode->i_mutex
);
fill_pre_wcc(fhp);
fhp->fh_locked = 1;
}
fill_pre_wcc(fhp);
fhp->fh_locked = 1;
}
@@
-333,7
+333,7
@@
fh_unlock(struct svc_fh *fhp)
if (fhp->fh_locked) {
fill_post_wcc(fhp);
if (fhp->fh_locked) {
fill_post_wcc(fhp);
-
up(&fhp->fh_dentry->d_inode->i_sem
);
+
mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex
);
fhp->fh_locked = 0;
}
}
fhp->fh_locked = 0;
}
}