diff options
Diffstat (limited to 'fs/ceph/mds_client.c')
-rw-r--r-- | fs/ceph/mds_client.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 76995a960432..ccb4141e306f 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -1268,7 +1268,7 @@ retry: | |||
1268 | struct inode *inode = temp->d_inode; | 1268 | struct inode *inode = temp->d_inode; |
1269 | 1269 | ||
1270 | if (inode && ceph_snap(inode) == CEPH_SNAPDIR) { | 1270 | if (inode && ceph_snap(inode) == CEPH_SNAPDIR) { |
1271 | dout("build_path_dentry path+%d: %p SNAPDIR\n", | 1271 | dout("build_path path+%d: %p SNAPDIR\n", |
1272 | pos, temp); | 1272 | pos, temp); |
1273 | } else if (stop_on_nosnap && inode && | 1273 | } else if (stop_on_nosnap && inode && |
1274 | ceph_snap(inode) == CEPH_NOSNAP) { | 1274 | ceph_snap(inode) == CEPH_NOSNAP) { |
@@ -1279,20 +1279,18 @@ retry: | |||
1279 | break; | 1279 | break; |
1280 | strncpy(path + pos, temp->d_name.name, | 1280 | strncpy(path + pos, temp->d_name.name, |
1281 | temp->d_name.len); | 1281 | temp->d_name.len); |
1282 | dout("build_path_dentry path+%d: %p '%.*s'\n", | ||
1283 | pos, temp, temp->d_name.len, path + pos); | ||
1284 | } | 1282 | } |
1285 | if (pos) | 1283 | if (pos) |
1286 | path[--pos] = '/'; | 1284 | path[--pos] = '/'; |
1287 | temp = temp->d_parent; | 1285 | temp = temp->d_parent; |
1288 | if (temp == NULL) { | 1286 | if (temp == NULL) { |
1289 | pr_err("build_path_dentry corrupt dentry\n"); | 1287 | pr_err("build_path corrupt dentry\n"); |
1290 | kfree(path); | 1288 | kfree(path); |
1291 | return ERR_PTR(-EINVAL); | 1289 | return ERR_PTR(-EINVAL); |
1292 | } | 1290 | } |
1293 | } | 1291 | } |
1294 | if (pos != 0) { | 1292 | if (pos != 0) { |
1295 | pr_err("build_path_dentry did not end path lookup where " | 1293 | pr_err("build_path did not end path lookup where " |
1296 | "expected, namelen is %d, pos is %d\n", len, pos); | 1294 | "expected, namelen is %d, pos is %d\n", len, pos); |
1297 | /* presumably this is only possible if racing with a | 1295 | /* presumably this is only possible if racing with a |
1298 | rename of one of the parent directories (we can not | 1296 | rename of one of the parent directories (we can not |
@@ -1304,7 +1302,7 @@ retry: | |||
1304 | 1302 | ||
1305 | *base = ceph_ino(temp->d_inode); | 1303 | *base = ceph_ino(temp->d_inode); |
1306 | *plen = len; | 1304 | *plen = len; |
1307 | dout("build_path_dentry on %p %d built %llx '%.*s'\n", | 1305 | dout("build_path on %p %d built %llx '%.*s'\n", |
1308 | dentry, atomic_read(&dentry->d_count), *base, len, path); | 1306 | dentry, atomic_read(&dentry->d_count), *base, len, path); |
1309 | return path; | 1307 | return path; |
1310 | } | 1308 | } |