diff options
author | Sage Weil <sage@newdream.net> | 2010-11-06 12:41:16 -0700 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-11-07 08:40:43 -0800 |
commit | d8b16b3d1c9d8d9124d647d05797383d35e2d645 (patch) | |
tree | 29bd57396f016572b5535c17a198b24062e2c79d /fs | |
parent | df9f86faf3ee610527ed02031fe7dd3c8b752e44 (diff) | |
download | op-kernel-dev-d8b16b3d1c9d8d9124d647d05797383d35e2d645.zip op-kernel-dev-d8b16b3d1c9d8d9124d647d05797383d35e2d645.tar.gz |
ceph: fix bad pointer dereference in ceph_fill_trace
We dereference *in a few lines down, but only set it on rename. It is
apparently pretty rare for this to trigger, but I have been hitting it
with a clustered MDSs.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ceph/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 1d6a45b..cd0432c 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1055,7 +1055,8 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req, ininfo = rinfo->targeti.in; vino.ino = le64_to_cpu(ininfo->ino); vino.snap = le64_to_cpu(ininfo->snapid); - if (!dn->d_inode) { + in = dn->d_inode; + if (!in) { in = ceph_get_inode(sb, vino); if (IS_ERR(in)) { pr_err("fill_trace bad get_inode " |