diff options
| author | Sage Weil <sage@newdream.net> | 2010-06-21 10:38:14 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-06-21 16:04:10 -0700 |
| commit | d69ed05a80f23b25f06e73af9b7e701ce4900edc (patch) | |
| tree | dfe4d372b1c2bb66a71d13d6bf8a22758640ddd0 /fs/ceph/inode.c | |
| parent | cebc5be6b6c82a99231e9c9af451e9e3d3399ec6 (diff) | |
| download | linux-3.10-d69ed05a80f23b25f06e73af9b7e701ce4900edc.tar.gz linux-3.10-d69ed05a80f23b25f06e73af9b7e701ce4900edc.tar.bz2 linux-3.10-d69ed05a80f23b25f06e73af9b7e701ce4900edc.zip | |
ceph: handle splice_dentry/d_materialize_unique error in readdir_prepopulate
Handle a splice_dentry failure (due to a d_materialize_unique error)
without crashing. (Also, report the error code.)
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/inode.c')
| -rw-r--r-- | fs/ceph/inode.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index ab47f46ca28..8f9b9fe8ef9 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -854,8 +854,8 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in, d_drop(dn); realdn = d_materialise_unique(dn, in); if (IS_ERR(realdn)) { - pr_err("splice_dentry error %p inode %p ino %llx.%llx\n", - dn, in, ceph_vinop(in)); + pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n", + PTR_ERR(realdn), dn, in, ceph_vinop(in)); if (prehash) *prehash = false; /* don't rehash on error */ dn = realdn; /* note realdn contains the error */ @@ -1234,18 +1234,23 @@ retry_lookup: goto out; } dn = splice_dentry(dn, in, NULL); + if (IS_ERR(dn)) + dn = NULL; } if (fill_inode(in, &rinfo->dir_in[i], NULL, session, req->r_request_started, -1, &req->r_caps_reservation) < 0) { pr_err("fill_inode badness on %p\n", in); - dput(dn); - continue; + goto next_item; } - update_dentry_lease(dn, rinfo->dir_dlease[i], - req->r_session, req->r_request_started); - dput(dn); + if (dn) + update_dentry_lease(dn, rinfo->dir_dlease[i], + req->r_session, + req->r_request_started); +next_item: + if (dn) + dput(dn); } req->r_did_prepopulate = true; |