projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
fs
/
nfsd
/
nfsfh.h
diff --git
a/fs/nfsd/nfsfh.h
b/fs/nfsd/nfsfh.h
index
0770bcb
..
f84fe6b
100644
(file)
--- a/
fs/nfsd/nfsfh.h
+++ b/
fs/nfsd/nfsfh.h
@@
-288,7
+288,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);
+
inode_lock_nested(inode
, subclass);
fill_pre_wcc(fhp);
fhp->fh_locked = true;
}
fill_pre_wcc(fhp);
fhp->fh_locked = true;
}
@@
-307,7
+307,7
@@
fh_unlock(struct svc_fh *fhp)
{
if (fhp->fh_locked) {
fill_post_wcc(fhp);
{
if (fhp->fh_locked) {
fill_post_wcc(fhp);
-
mutex_unlock(&d_inode(fhp->fh_dentry)->i_mutex
);
+
inode_unlock(d_inode(fhp->fh_dentry)
);
fhp->fh_locked = false;
}
}
fhp->fh_locked = false;
}
}