diff options
| author | Sage Weil <sage@newdream.net> | 2011-07-26 20:30:55 +0200 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-07-26 20:30:55 +0200 |
| commit | e5f86dc377e7ff2b4195831153a85a3e76fefff2 (patch) | |
| tree | f15c11fc2c9b08e64555bbb601e582dc8f7325bd /fs/ceph/super.h | |
| parent | ceph: protect d_parent access in ceph_d_revalidate (diff) | |
| download | linux-e5f86dc377e7ff2b4195831153a85a3e76fefff2.tar.xz linux-e5f86dc377e7ff2b4195831153a85a3e76fefff2.zip | |
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/super.h')
| -rw-r--r-- | fs/ceph/super.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index c1eb9a014b74..35dc9656e499 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -800,7 +800,7 @@ extern void ceph_dentry_lru_add(struct dentry *dn); extern void ceph_dentry_lru_touch(struct dentry *dn); extern void ceph_dentry_lru_del(struct dentry *dn); extern void ceph_invalidate_dentry_lease(struct dentry *dentry); -extern unsigned ceph_dentry_hash(struct dentry *dn); +extern unsigned ceph_dentry_hash(struct inode *dir, struct dentry *dn); extern struct inode *ceph_get_dentry_parent_inode(struct dentry *dentry); /* |