projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'wireless-drivers-for-davem-2016-02-18' of git://git.kernel.org/pub/scm...
[cascardo/linux.git]
/
fs
/
ceph
/
export.c
diff --git
a/fs/ceph/export.c
b/fs/ceph/export.c
index
fe02ae7
..
3b31723
100644
(file)
--- a/
fs/ceph/export.c
+++ b/
fs/ceph/export.c
@@
-215,7
+215,7
@@
static int ceph_get_name(struct dentry *parent, char *name,
if (IS_ERR(req))
return PTR_ERR(req);
if (IS_ERR(req))
return PTR_ERR(req);
-
mutex_lock(&d_inode(parent)->i_mutex
);
+
inode_lock(d_inode(parent)
);
req->r_inode = d_inode(child);
ihold(d_inode(child));
req->r_inode = d_inode(child);
ihold(d_inode(child));
@@
-224,7
+224,7
@@
static int ceph_get_name(struct dentry *parent, char *name,
req->r_num_caps = 2;
err = ceph_mdsc_do_request(mdsc, NULL, req);
req->r_num_caps = 2;
err = ceph_mdsc_do_request(mdsc, NULL, req);
-
mutex_unlock(&d_inode(parent)->i_mutex
);
+
inode_unlock(d_inode(parent)
);
if (!err) {
struct ceph_mds_reply_info_parsed *rinfo = &req->r_reply_info;
if (!err) {
struct ceph_mds_reply_info_parsed *rinfo = &req->r_reply_info;