f2fs: revive F2FS_IOC_ABORT_VOLATILE_WRITE

commit 23339e5752d01a4b5e122759b002cf896d26f6c1 upstream.

F2FS_IOC_ABORT_VOLATILE_WRITE was used to abort a atomic write before.
However it was removed accidentally. So revive it by changing the name,
since volatile write had gone.

Signed-off-by: Daeho Jeong <daehojeong@google.com>
Fiexes: 7bc155fec5b3("f2fs: kill volatile write support")
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index c2644a085876204dd81b82fae91d0b6a8eb49903..d89fb557941a2a879acf10bf2b142ad82531047e 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -2102,6 +2102,31 @@ unlock_out:
        return ret;
 }
 
+static int f2fs_ioc_abort_atomic_write(struct file *filp)
+{
+       struct inode *inode = file_inode(filp);
+       struct user_namespace *mnt_userns = file_mnt_user_ns(filp);
+       int ret;
+
+       if (!inode_owner_or_capable(mnt_userns, inode))
+               return -EACCES;
+
+       ret = mnt_want_write_file(filp);
+       if (ret)
+               return ret;
+
+       inode_lock(inode);
+
+       if (f2fs_is_atomic_file(inode))
+               f2fs_abort_atomic_write(inode, true);
+
+       inode_unlock(inode);
+
+       mnt_drop_write_file(filp);
+       f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
+       return ret;
+}
+
 static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)
 {
        struct inode *inode = file_inode(filp);
@@ -4039,9 +4064,10 @@ static long __f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                return f2fs_ioc_start_atomic_write(filp);
        case F2FS_IOC_COMMIT_ATOMIC_WRITE:
                return f2fs_ioc_commit_atomic_write(filp);
+       case F2FS_IOC_ABORT_ATOMIC_WRITE:
+               return f2fs_ioc_abort_atomic_write(filp);
        case F2FS_IOC_START_VOLATILE_WRITE:
        case F2FS_IOC_RELEASE_VOLATILE_WRITE:
-       case F2FS_IOC_ABORT_VOLATILE_WRITE:
                return -EOPNOTSUPP;
        case F2FS_IOC_SHUTDOWN:
                return f2fs_ioc_shutdown(filp, arg);
@@ -4666,7 +4692,7 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case F2FS_IOC_COMMIT_ATOMIC_WRITE:
        case F2FS_IOC_START_VOLATILE_WRITE:
        case F2FS_IOC_RELEASE_VOLATILE_WRITE:
-       case F2FS_IOC_ABORT_VOLATILE_WRITE:
+       case F2FS_IOC_ABORT_ATOMIC_WRITE:
        case F2FS_IOC_SHUTDOWN:
        case FITRIM:
        case FS_IOC_SET_ENCRYPTION_POLICY:

diff --git a/include/uapi/linux/f2fs.h b/include/uapi/linux/f2fs.h
index 352a822d437099ef4f309ec0ad9e910ac02d5be9..3121d127d5aaecfed7b1e1479ba3c1c83a5bcd0c 100644 (file)
--- a/include/uapi/linux/f2fs.h
+++ b/include/uapi/linux/f2fs.h
@@ -13,7 +13,7 @@
 #define F2FS_IOC_COMMIT_ATOMIC_WRITE   _IO(F2FS_IOCTL_MAGIC, 2)
 #define F2FS_IOC_START_VOLATILE_WRITE  _IO(F2FS_IOCTL_MAGIC, 3)
 #define F2FS_IOC_RELEASE_VOLATILE_WRITE        _IO(F2FS_IOCTL_MAGIC, 4)
-#define F2FS_IOC_ABORT_VOLATILE_WRITE  _IO(F2FS_IOCTL_MAGIC, 5)
+#define F2FS_IOC_ABORT_ATOMIC_WRITE    _IO(F2FS_IOCTL_MAGIC, 5)
 #define F2FS_IOC_GARBAGE_COLLECT       _IOW(F2FS_IOCTL_MAGIC, 6, __u32)
 #define F2FS_IOC_WRITE_CHECKPOINT      _IO(F2FS_IOCTL_MAGIC, 7)
 #define F2FS_IOC_DEFRAGMENT            _IOWR(F2FS_IOCTL_MAGIC, 8,      \