diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 12:11:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 12:11:13 -0800 |
| commit | c292fe4aae5aa5c089633bc40342d27c8275306a (patch) | |
| tree | 84c6898327eb35c3c20c1728eaff8ca19094ddeb /fs/ceph/dir.c | |
| parent | 7758c4d6e9371efa04a1cf1b124bbf9cc43e830e (diff) | |
| parent | 224736d9113ab4a7cf3f05c05377492bd99b4b02 (diff) | |
| download | linux-c292fe4aae5aa5c089633bc40342d27c8275306a.tar.gz linux-c292fe4aae5aa5c089633bc40342d27c8275306a.tar.bz2 linux-c292fe4aae5aa5c089633bc40342d27c8275306a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: Allocate larger oid buffer in request msgs
ceph: initialize root dentry
ceph: fix iput race when queueing inode work
Diffstat (limited to 'fs/ceph/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 2abd0dfad7f8..bca3948e9dbf 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -1143,7 +1143,7 @@ static void ceph_d_prune(struct dentry *dentry) { struct ceph_dentry_info *di; - dout("d_release %p\n", dentry); + dout("ceph_d_prune %p\n", dentry); /* do we have a valid parent? */ if (!dentry->d_parent || IS_ROOT(dentry)) |