Merge branch 'fix/asoc' into for-linus

[karo-tx-linux.git] / fs / nilfs2 / ioctl.c

diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index ac258beeda3c4e3e9a3a36a375619838c8c7a350..886649627c3d68d568914ee3d88983cbebcf08a5 100644 (file)
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -27,7 +27,7 @@
 #include <linux/uaccess.h>     /* copy_from_user(), copy_to_user() */
 #include <linux/vmalloc.h>
 #include <linux/compat.h>      /* compat_ptr() */
-#include <linux/mount.h>       /* mnt_want_write(), mnt_drop_write() */
+#include <linux/mount.h>       /* mnt_want_write_file(), mnt_drop_write_file() */
 #include <linux/buffer_head.h>
 #include <linux/nilfs2_fs.h>
 #include "nilfs.h"
@@ -119,7 +119,7 @@ static int nilfs_ioctl_setflags(struct inode *inode, struct file *filp,
        if (get_user(flags, (int __user *)argp))
                return -EFAULT;
 
-       ret = mnt_want_write(filp->f_path.mnt);
+       ret = mnt_want_write_file(filp);
        if (ret)
                return ret;
 
@@ -154,7 +154,7 @@ static int nilfs_ioctl_setflags(struct inode *inode, struct file *filp,
        ret = nilfs_transaction_commit(inode->i_sb);
 out:
        mutex_unlock(&inode->i_mutex);
-       mnt_drop_write(filp->f_path.mnt);
+       mnt_drop_write_file(filp);
        return ret;
 }
 
@@ -174,7 +174,7 @@ static int nilfs_ioctl_change_cpmode(struct inode *inode, struct file *filp,
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       ret = mnt_want_write(filp->f_path.mnt);
+       ret = mnt_want_write_file(filp);
        if (ret)
                return ret;
 
@@ -194,7 +194,7 @@ static int nilfs_ioctl_change_cpmode(struct inode *inode, struct file *filp,
 
        up_read(&inode->i_sb->s_umount);
 out:
-       mnt_drop_write(filp->f_path.mnt);
+       mnt_drop_write_file(filp);
        return ret;
 }
 
@@ -210,7 +210,7 @@ nilfs_ioctl_delete_checkpoint(struct inode *inode, struct file *filp,
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       ret = mnt_want_write(filp->f_path.mnt);
+       ret = mnt_want_write_file(filp);
        if (ret)
                return ret;
 
@@ -225,7 +225,7 @@ nilfs_ioctl_delete_checkpoint(struct inode *inode, struct file *filp,
        else
                nilfs_transaction_commit(inode->i_sb); /* never fails */
 out:
-       mnt_drop_write(filp->f_path.mnt);
+       mnt_drop_write_file(filp);
        return ret;
 }
 
@@ -591,7 +591,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       ret = mnt_want_write(filp->f_path.mnt);
+       ret = mnt_want_write_file(filp);
        if (ret)
                return ret;
 
@@ -675,7 +675,7 @@ out_free:
                vfree(kbufs[n]);
        kfree(kbufs[4]);
 out:
-       mnt_drop_write(filp->f_path.mnt);
+       mnt_drop_write_file(filp);
        return ret;
 }
 
@@ -710,7 +710,7 @@ static int nilfs_ioctl_resize(struct inode *inode, struct file *filp,
        if (!capable(CAP_SYS_ADMIN))
                goto out;
 
-       ret = mnt_want_write(filp->f_path.mnt);
+       ret = mnt_want_write_file(filp);
        if (ret)
                goto out;
 
@@ -721,7 +721,7 @@ static int nilfs_ioctl_resize(struct inode *inode, struct file *filp,
        ret = nilfs_resize_fs(inode->i_sb, newsize);
 
 out_drop_write:
-       mnt_drop_write(filp->f_path.mnt);
+       mnt_drop_write_file(filp);
 out:
        return ret;
 }