projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perf/urgent
[cascardo/linux.git]
/
fs
/
nfsd
/
nfsfh.h
diff --git
a/fs/nfsd/nfsfh.h
b/fs/nfsd/nfsfh.h
index
e5e6707
..
4775bc4
100644
(file)
--- a/
fs/nfsd/nfsfh.h
+++ b/
fs/nfsd/nfsfh.h
@@
-173,8
+173,8
@@
fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
BUG_ON(!dentry);
if (fhp->fh_locked) {
- printk(KERN_WARNING "fh_lock: %
s/%s
already locked!\n",
- dentry
->d_parent->d_name.name, dentry->d_name.name
);
+ printk(KERN_WARNING "fh_lock: %
pd2
already locked!\n",
+ dentry);
return;
}