projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'please-pull-misc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
binfmt_misc.c
diff --git
a/fs/binfmt_misc.c
b/fs/binfmt_misc.c
index 9dcb05409ba7e7aadf43a1e46ad52eac24828f6f..78f005f378476011a43c41e7d0eaa8d99ac1af21 100644
(file)
--- a/
fs/binfmt_misc.c
+++ b/
fs/binfmt_misc.c
@@
-591,7
+591,7
@@
static void kill_node(Node *e)
write_unlock(&entries_lock);
if (dentry) {
write_unlock(&entries_lock);
if (dentry) {
- drop_nlink(d
entry->d_inode
);
+ drop_nlink(d
_inode(dentry)
);
d_drop(dentry);
dput(dentry);
simple_release_fs(&bm_mnt, &entry_count);
d_drop(dentry);
dput(dentry);
simple_release_fs(&bm_mnt, &entry_count);
@@
-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(&
root->d_inode
->i_mutex);
+ mutex_lock(&
d_inode(root)
->i_mutex);
kill_node(e);
kill_node(e);
- mutex_unlock(&
root->d_inode
->i_mutex);
+ mutex_unlock(&
d_inode(root)
->i_mutex);
dput(root);
break;
default:
dput(root);
break;
default:
@@
-675,14
+675,14
@@
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(&
root->d_inode
->i_mutex);
+ mutex_lock(&
d_inode(root)
->i_mutex);
dentry = lookup_one_len(e->name, root, strlen(e->name));
err = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto out;
err = -EEXIST;
dentry = lookup_one_len(e->name, root, strlen(e->name));
err = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto out;
err = -EEXIST;
- if (d
entry->d_inode
)
+ if (d
_really_is_positive(dentry)
)
goto out2;
inode = bm_get_inode(sb, S_IFREG | 0644);
goto out2;
inode = bm_get_inode(sb, S_IFREG | 0644);
@@
-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(&
root->d_inode
->i_mutex);
+ mutex_unlock(&
d_inode(root)
->i_mutex);
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(&
root->d_inode
->i_mutex);
+ mutex_lock(&
d_inode(root)
->i_mutex);
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(&
root->d_inode
->i_mutex);
+ mutex_unlock(&
d_inode(root)
->i_mutex);
dput(root);
break;
default:
dput(root);
break;
default: