Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / fs / ext4 / ioctl.c

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 46a8de6f2089e521288fcdd05de022c4a7374810..e87a932b073bcf7db1916db8ef1ac469c676ca63 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -45,7 +45,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                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;
 
@@ -134,7 +134,7 @@ flags_err:
                        err = ext4_ext_migrate(inode);
 flags_out:
                mutex_unlock(&inode->i_mutex);
-               mnt_drop_write(filp->f_path.mnt);
+               mnt_drop_write_file(filp);
                return err;
        }
        case EXT4_IOC_GETVERSION:
@@ -150,7 +150,7 @@ flags_out:
                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)) {
@@ -175,7 +175,7 @@ flags_out:
 unlock_out:
                mutex_unlock(&inode->i_mutex);
 setversion_out:
-               mnt_drop_write(filp->f_path.mnt);
+               mnt_drop_write_file(filp);
                return err;
        }
        case EXT4_IOC_GROUP_EXTEND: {
@@ -196,7 +196,7 @@ setversion_out:
                        return -EOPNOTSUPP;
                }
 
-               err = mnt_want_write(filp->f_path.mnt);
+               err = mnt_want_write_file(filp);
                if (err)
                        return err;
 
@@ -208,7 +208,7 @@ setversion_out:
                }
                if (err == 0)
                        err = err2;
-               mnt_drop_write(filp->f_path.mnt);
+               mnt_drop_write_file(filp);
                ext4_resize_end(sb);
 
                return err;
@@ -244,13 +244,13 @@ setversion_out:
                        return -EOPNOTSUPP;
                }
 
-               err = mnt_want_write(filp->f_path.mnt);
+               err = mnt_want_write_file(filp);
                if (err)
                        goto mext_out;
 
                err = ext4_move_extents(filp, donor_filp, me.orig_start,
                                        me.donor_start, me.len, &me.moved_len);
-               mnt_drop_write(filp->f_path.mnt);
+               mnt_drop_write_file(filp);
                if (me.moved_len > 0)
                        file_remove_suid(donor_filp);
 
@@ -281,7 +281,7 @@ mext_out:
                        return -EOPNOTSUPP;
                }
 
-               err = mnt_want_write(filp->f_path.mnt);
+               err = mnt_want_write_file(filp);
                if (err)
                        return err;
 
@@ -293,7 +293,7 @@ mext_out:
                }
                if (err == 0)
                        err = err2;
-               mnt_drop_write(filp->f_path.mnt);
+               mnt_drop_write_file(filp);
                ext4_resize_end(sb);
 
                return err;
@@ -305,7 +305,7 @@ mext_out:
                if (!inode_owner_or_capable(inode))
                        return -EACCES;
 
-               err = mnt_want_write(filp->f_path.mnt);
+               err = mnt_want_write_file(filp);
                if (err)
                        return err;
                /*
@@ -317,7 +317,7 @@ mext_out:
                mutex_lock(&(inode->i_mutex));
                err = ext4_ext_migrate(inode);
                mutex_unlock(&(inode->i_mutex));
-               mnt_drop_write(filp->f_path.mnt);
+               mnt_drop_write_file(filp);
                return err;
        }
 
@@ -327,11 +327,11 @@ mext_out:
                if (!inode_owner_or_capable(inode))
                        return -EACCES;
 
-               err = mnt_want_write(filp->f_path.mnt);
+               err = mnt_want_write_file(filp);
                if (err)
                        return err;
                err = ext4_alloc_da_blocks(inode);
-               mnt_drop_write(filp->f_path.mnt);
+               mnt_drop_write_file(filp);
                return err;
        }