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
vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ext3
/
ioctl.c
diff --git
a/fs/ext3/ioctl.c
b/fs/ext3/ioctl.c
index ba1b54e23cae14fd08b630db914b8f639908406d..8e37c41a071b31e90756f9b0762e37a2ac362065 100644
(file)
--- a/
fs/ext3/ioctl.c
+++ b/
fs/ext3/ioctl.c
@@
-44,7
+44,7
@@
long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (get_user(flags, (int __user *) arg))
return -EFAULT;
if (get_user(flags, (int __user *) arg))
return -EFAULT;
- err = mnt_want_write
(filp->f_path.mnt
);
+ err = mnt_want_write
_file(filp
);
if (err)
return err;
if (err)
return err;
@@
-110,7
+110,7
@@
flags_err:
err = ext3_change_inode_journal_flag(inode, jflag);
flags_out:
mutex_unlock(&inode->i_mutex);
err = ext3_change_inode_journal_flag(inode, jflag);
flags_out:
mutex_unlock(&inode->i_mutex);
- mnt_drop_write
(filp->f_path.mnt
);
+ mnt_drop_write
_file(filp
);
return err;
}
case EXT3_IOC_GETVERSION:
return err;
}
case EXT3_IOC_GETVERSION:
@@
-126,7
+126,7
@@
flags_out:
if (!inode_owner_or_capable(inode))
return -EPERM;
if (!inode_owner_or_capable(inode))
return -EPERM;
- err = mnt_want_write
(filp->f_path.mnt
);
+ err = mnt_want_write
_file(filp
);
if (err)
return err;
if (get_user(generation, (int __user *) arg)) {
if (err)
return err;
if (get_user(generation, (int __user *) arg)) {
@@
-147,7
+147,7
@@
flags_out:
}
ext3_journal_stop(handle);
setversion_out:
}
ext3_journal_stop(handle);
setversion_out:
- mnt_drop_write
(filp->f_path.mnt
);
+ mnt_drop_write
_file(filp
);
return err;
}
case EXT3_IOC_GETRSVSZ:
return err;
}
case EXT3_IOC_GETRSVSZ:
@@
-164,7
+164,7
@@
setversion_out:
if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode))
return -ENOTTY;
if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode))
return -ENOTTY;
- err = mnt_want_write
(filp->f_path.mnt
);
+ err = mnt_want_write
_file(filp
);
if (err)
return err;
if (err)
return err;
@@
-195,7
+195,7
@@
setversion_out:
}
mutex_unlock(&ei->truncate_mutex);
setrsvsz_out:
}
mutex_unlock(&ei->truncate_mutex);
setrsvsz_out:
- mnt_drop_write
(filp->f_path.mnt
);
+ mnt_drop_write
_file(filp
);
return err;
}
case EXT3_IOC_GROUP_EXTEND: {
return err;
}
case EXT3_IOC_GROUP_EXTEND: {
@@
-206,7
+206,7
@@
setrsvsz_out:
if (!capable(CAP_SYS_RESOURCE))
return -EPERM;
if (!capable(CAP_SYS_RESOURCE))
return -EPERM;
- err = mnt_want_write
(filp->f_path.mnt
);
+ err = mnt_want_write
_file(filp
);
if (err)
return err;
if (err)
return err;
@@
-221,7
+221,7
@@
setrsvsz_out:
if (err == 0)
err = err2;
group_extend_out:
if (err == 0)
err = err2;
group_extend_out:
- mnt_drop_write
(filp->f_path.mnt
);
+ mnt_drop_write
_file(filp
);
return err;
}
case EXT3_IOC_GROUP_ADD: {
return err;
}
case EXT3_IOC_GROUP_ADD: {
@@
-232,7
+232,7
@@
group_extend_out:
if (!capable(CAP_SYS_RESOURCE))
return -EPERM;
if (!capable(CAP_SYS_RESOURCE))
return -EPERM;
- err = mnt_want_write
(filp->f_path.mnt
);
+ err = mnt_want_write
_file(filp
);
if (err)
return err;
if (err)
return err;
@@
-249,7
+249,7
@@
group_extend_out:
if (err == 0)
err = err2;
group_add_out:
if (err == 0)
err = err2;
group_add_out:
- mnt_drop_write
(filp->f_path.mnt
);
+ mnt_drop_write
_file(filp
);
return err;
}
case FITRIM: {
return err;
}
case FITRIM: {