diff options
| author | Sage Weil <sage@newdream.net> | 2011-07-26 11:30:55 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-07-26 11:30:55 -0700 |
| commit | e5f86dc377e7ff2b4195831153a85a3e76fefff2 (patch) | |
| tree | f15c11fc2c9b08e64555bbb601e582dc8f7325bd /fs/ceph/mds_client.c | |
| parent | bf1c6aca96c9d2f117dc7e590c2bc2304e7febe1 (diff) | |
ceph: avoid d_parent in ceph_dentry_hash; fix ceph_encode_fh() hashing bug
Have caller pass in a safely-obtained reference to the parent directory
for calculating a dentry's hash valud.
While we're here, simpify the flow through ceph_encode_fh() so that there
is a single exit point and cleanup.
Also fix a bug with the dentry hash calculation: calculate the hash for the
dentry we were given, not its parent.
Reviewed-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/mds_client.c')
| -rw-r--r-- | fs/ceph/mds_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 3b1e743b8c8..8a09cd5a659 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -670,7 +670,7 @@ static int __choose_mds(struct ceph_mds_client *mdsc, } else { /* dir + name */ inode = dir; - hash = ceph_dentry_hash(req->r_dentry); + hash = ceph_dentry_hash(dir, req->r_dentry); is_hash = true; } } |