From 4487a23fe7d19347cb16f28e2fcacbcd0fc01964 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 18 Mar 2010 10:14:30 -0700 Subject: [PATCH] --- yaml --- r: 198043 b: refs/heads/master c: 104648ad3f2ebe8556c020e5f0344853076cd5ee h: refs/heads/master i: 198041: 3ac73687fb9862da71571222c2703b3873c8f4bf 198039: fbf4b5b847c079e4c3e29fdec4ad46b8a9e0d24a v: v3 --- [refs] | 2 +- trunk/fs/ceph/mds_client.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a7c12df39f51..04d106487028 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31459fe4b24c1e09712eff0d82a5276f4fd0e3cf +refs/heads/master: 104648ad3f2ebe8556c020e5f0344853076cd5ee diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c index 76995a960432..ccb4141e306f 100644 --- a/trunk/fs/ceph/mds_client.c +++ b/trunk/fs/ceph/mds_client.c @@ -1268,7 +1268,7 @@ char *ceph_mdsc_build_path(struct dentry *dentry, int *plen, u64 *base, struct inode *inode = temp->d_inode; if (inode && ceph_snap(inode) == CEPH_SNAPDIR) { - dout("build_path_dentry path+%d: %p SNAPDIR\n", + dout("build_path path+%d: %p SNAPDIR\n", pos, temp); } else if (stop_on_nosnap && inode && ceph_snap(inode) == CEPH_NOSNAP) { @@ -1279,20 +1279,18 @@ char *ceph_mdsc_build_path(struct dentry *dentry, int *plen, u64 *base, break; strncpy(path + pos, temp->d_name.name, temp->d_name.len); - dout("build_path_dentry path+%d: %p '%.*s'\n", - pos, temp, temp->d_name.len, path + pos); } if (pos) path[--pos] = '/'; temp = temp->d_parent; if (temp == NULL) { - pr_err("build_path_dentry corrupt dentry\n"); + pr_err("build_path corrupt dentry\n"); kfree(path); return ERR_PTR(-EINVAL); } } if (pos != 0) { - pr_err("build_path_dentry did not end path lookup where " + pr_err("build_path did not end path lookup where " "expected, namelen is %d, pos is %d\n", len, pos); /* presumably this is only possible if racing with a rename of one of the parent directories (we can not @@ -1304,7 +1302,7 @@ char *ceph_mdsc_build_path(struct dentry *dentry, int *plen, u64 *base, *base = ceph_ino(temp->d_inode); *plen = len; - dout("build_path_dentry on %p %d built %llx '%.*s'\n", + dout("build_path on %p %d built %llx '%.*s'\n", dentry, atomic_read(&dentry->d_count), *base, len, path); return path; }