Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198043
b: refs/heads/master
c: 104648a
h: refs/heads/master
i:
  198041: 3ac7368
  198039: fbf4b5b
v: v3
  • Loading branch information
Sage Weil committed May 17, 2010
1 parent ac8218a commit 4487a23
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 31459fe4b24c1e09712eff0d82a5276f4fd0e3cf
refs/heads/master: 104648ad3f2ebe8556c020e5f0344853076cd5ee
10 changes: 4 additions & 6 deletions trunk/fs/ceph/mds_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand All @@ -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;
}
Expand Down

0 comments on commit 4487a23

Please sign in to comment.