leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph: handle splice_dentry/d_materialize_unique error in readdir_prepopulate

Browse Source 
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>
This commit is contained in:
Sage Weil 2010-06-21 10:38:14 -07:00
parent cebc5be6b6
commit d69ed05a80
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/ceph/inode.c
View File

@ -854,8 +854,8 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in,
d_drop(dn); d_drop(dn);
realdn = d_materialise_unique(dn, in); realdn = d_materialise_unique(dn, in);
if (IS_ERR(realdn)) { if (IS_ERR(realdn)) {
pr_err("splice_dentry error %p inode %p ino %llx.%llx\n", pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n",
dn, in, ceph_vinop(in)); PTR_ERR(realdn), dn, in, ceph_vinop(in));
if (prehash) if (prehash)
*prehash = false; /* don't rehash on error */ *prehash = false; /* don't rehash on error */
dn = realdn; /* note realdn contains the error */ dn = realdn; /* note realdn contains the error */
@ -1234,17 +1234,22 @@ retry_lookup:
goto out; goto out;
} }
dn = splice_dentry(dn, in, NULL); dn = splice_dentry(dn, in, NULL);
if (IS_ERR(dn))
dn = NULL;
} }
if (fill_inode(in, &rinfo->dir_in[i], NULL, session, if (fill_inode(in, &rinfo->dir_in[i], NULL, session,
req->r_request_started, -1, req->r_request_started, -1,
&req->r_caps_reservation) < 0) { &req->r_caps_reservation) < 0) {
pr_err("fill_inode badness on %p\n", in); pr_err("fill_inode badness on %p\n", in);
dput(dn); goto next_item;
continue;
} }
if (dn)
update_dentry_lease(dn, rinfo->dir_dlease[i], update_dentry_lease(dn, rinfo->dir_dlease[i],
req->r_session, req->r_request_started); req->r_session,
req->r_request_started);
next_item:
if (dn)
dput(dn); dput(dn);
} }
req->r_did_prepopulate = true; req->r_did_prepopulate = true;