projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
fs
/
binfmt_misc.c
diff --git
a/fs/binfmt_misc.c
b/fs/binfmt_misc.c
index
78f005f
..
3a3ced7
100644
(file)
--- a/
fs/binfmt_misc.c
+++ b/
fs/binfmt_misc.c
@@
-638,11
+638,11
@@
static ssize_t bm_entry_write(struct file *file, const char __user *buffer,
case 3:
/* Delete this handler. */
root = dget(file->f_path.dentry->d_sb->s_root);
case 3:
/* Delete this handler. */
root = dget(file->f_path.dentry->d_sb->s_root);
-
mutex_lock(&d_inode(root)->i_mutex
);
+
inode_lock(d_inode(root)
);
kill_node(e);
kill_node(e);
-
mutex_unlock(&d_inode(root)->i_mutex
);
+
inode_unlock(d_inode(root)
);
dput(root);
break;
default:
dput(root);
break;
default:
@@
-675,7
+675,7
@@
static ssize_t bm_register_write(struct file *file, const char __user *buffer,
return PTR_ERR(e);
root = dget(sb->s_root);
return PTR_ERR(e);
root = dget(sb->s_root);
-
mutex_lock(&d_inode(root)->i_mutex
);
+
inode_lock(d_inode(root)
);
dentry = lookup_one_len(e->name, root, strlen(e->name));
err = PTR_ERR(dentry);
if (IS_ERR(dentry))
dentry = lookup_one_len(e->name, root, strlen(e->name));
err = PTR_ERR(dentry);
if (IS_ERR(dentry))
@@
-711,7
+711,7
@@
static ssize_t bm_register_write(struct file *file, const char __user *buffer,
out2:
dput(dentry);
out:
out2:
dput(dentry);
out:
-
mutex_unlock(&d_inode(root)->i_mutex
);
+
inode_unlock(d_inode(root)
);
dput(root);
if (err) {
dput(root);
if (err) {
@@
-754,12
+754,12
@@
static ssize_t bm_status_write(struct file *file, const char __user *buffer,
case 3:
/* Delete all handlers. */
root = dget(file->f_path.dentry->d_sb->s_root);
case 3:
/* Delete all handlers. */
root = dget(file->f_path.dentry->d_sb->s_root);
-
mutex_lock(&d_inode(root)->i_mutex
);
+
inode_lock(d_inode(root)
);
while (!list_empty(&entries))
kill_node(list_entry(entries.next, Node, list));
while (!list_empty(&entries))
kill_node(list_entry(entries.next, Node, list));
-
mutex_unlock(&d_inode(root)->i_mutex
);
+
inode_unlock(d_inode(root)
);
dput(root);
break;
default:
dput(root);
break;
default: