git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
fs
/
ceph
/
export.c
diff --git
a/fs/ceph/export.c
b/fs/ceph/export.c
index 17447644d6754b5ffd75d532a997353a14c0df9a..4480cb1c63e7c69b107628481388cf1e35f49b8d 100644
(file)
--- a/
fs/ceph/export.c
+++ b/
fs/ceph/export.c
@@
-133,7
+133,7
@@
static struct dentry *__cfh_to_dentry(struct super_block *sb,
req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_LOOKUPHASH,
USE_ANY_MDS);
if (IS_ERR(req))
- return ERR_
PTR(PTR_ERR(req)
);
+ return ERR_
CAST(req
);
req->r_ino1 = vino;
req->r_ino2.ino = cfh->parent_ino;