fs: add IOCB_SYNC and IOCB_DSYNC

This will allow us to do per-I/O sync file writes, as required by a lot
of fileservers or storage targets.

XXX: Will need a few additional audits for O_DSYNC

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 9e1f3fe257535542d6571fdf1f74fb66eb42c035..d8dc3512e9273cc7b1b8a7fbef2855f70e062689 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1662,7 +1662,7 @@ ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
        ret = __generic_file_write_iter(iocb, from);
        if (ret > 0) {
                ssize_t err;
-               err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+               err = generic_write_sync(iocb, iocb->ki_pos - ret, ret);
                if (err < 0)
                        ret = err;
        }

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 6c376311a9d7ee7a49ed84ebdb6b51434a6a9357..35ce146cceec2ed52cf9e54de697334f67a4049b 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1852,7 +1852,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
        BTRFS_I(inode)->last_sub_trans = root->log_transid;
        spin_unlock(&BTRFS_I(inode)->lock);
        if (num_written > 0) {
-               err = generic_write_sync(file, pos, num_written);
+               err = generic_write_sync(iocb, pos, num_written);
                if (err < 0)
                        num_written = err;
        }

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index cb070aa88e5725375880ee59700194d1654d5759..b22b68ccfbe563112fe1823b8894d287e2a18aa2 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2688,7 +2688,7 @@ out:
        inode_unlock(inode);
 
        if (rc > 0) {
-               ssize_t err = generic_write_sync(file, iocb->ki_pos - rc, rc);
+               ssize_t err = generic_write_sync(iocb, iocb->ki_pos - rc, rc);
                if (err < 0)
                        rc = err;
        }

diff --git a/fs/direct-io.c b/fs/direct-io.c
index c61314b84b0115696a338c1263979c7fd39d320a..f7bcc0193deed20a366f3631bc4a60c4ab308f2f 100644 (file)
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -268,7 +268,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)
                if (dio->rw & WRITE) {
                        int err;
 
-                       err = generic_write_sync(dio->iocb->ki_filp, offset,
+                       err = generic_write_sync(dio->iocb, offset,
                                                 transferred);
                        if (err < 0 && ret > 0)
                                ret = err;

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index fa2208bae2e1211d8d761dd4e90e934a64575306..1417e129be519f0d623a4438fd12d20ad2008693 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -172,7 +172,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
        if (ret > 0) {
                ssize_t err;
 
-               err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+               err = generic_write_sync(iocb, iocb->ki_pos - ret, ret);
                if (err < 0)
                        ret = err;
        }

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 443e07705c2a6099f6491eb8701d0654de3029f7..51ed8388e66cdafb54d900a240f42ff2095fb6ab 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1885,7 +1885,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
        if (ret > 0) {
                ssize_t err;
 
-               err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+               err = generic_write_sync(iocb, iocb->ki_pos - ret, ret);
                if (err < 0)
                        ret = err;
        }

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 208efc70ad49e992e71730d87497fb96b42e77c2..5a7d696093091ae59a7d66eaa8cc5e06df7a6ecb 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -895,7 +895,10 @@ static long __gfs2_fallocate(struct file *file, int mode, loff_t offset, loff_t
                mark_inode_dirty(inode);
        }
 
-       return generic_write_sync(file, pos, count);
+       if ((file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host))
+               return vfs_fsync_range(file, pos, pos + count - 1,
+                              (file->f_flags & __O_SYNC) ? 0 : 1);
+       return 0;
 
 out_trans_fail:
        gfs2_inplace_release(ip);

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 346b5d85ce9294795d1b5ff5eb5b1689ce9e0020..be86de9a77d76033003b3cf01cfcf4fcc5f18018 100644 (file)
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -1054,7 +1054,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)
                        if (i_size_read(inode) < iocb->ki_pos)
                                i_size_write(inode, iocb->ki_pos);
                        spin_unlock(&inode->i_lock);
-                       generic_write_sync(file, pos, result);
+                       generic_write_sync(iocb, pos, result);
                }
        }
        nfs_direct_req_release(dreq);

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 91117ada8528b0090befaeed2fa1ef7c7d38a787..10dc38cc02bb82575612c023cf9b5c59f970e8d1 100644 (file)
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -1953,7 +1953,7 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
        current->backing_dev_info = NULL;
        inode_unlock(vi);
        if (likely(written > 0)) {
-               err = generic_write_sync(file, iocb->ki_pos, written);
+               err = generic_write_sync(iocb, iocb->ki_pos, written);
                if (err < 0)
                        written = 0;
        }

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 7ab8d8196e902215d2d51e010c69fba460762cac..8e3d1ae53b11ddff95f1a4b3757cad38339a6ef2 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -152,7 +152,7 @@ out:
 
        if (retval > 0) {
                mark_inode_dirty(inode);
-               err = generic_write_sync(file, iocb->ki_pos - retval, retval);
+               err = generic_write_sync(iocb, iocb->ki_pos - retval, retval);
                if (err < 0)
                        retval = err;
        }

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 5de047ab2411ff367143e9c1412739e860a722c4..b5d70e77195d599067b5f3c12522f969138a7f46 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -908,7 +908,7 @@ xfs_file_write_iter(
                XFS_STATS_ADD(ip->i_mount, xs_write_bytes, ret);
 
                /* Handle various SYNC-type writes */
-               err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+               err = generic_write_sync(iocb, iocb->ki_pos - ret, ret);
                if (err < 0)
                        ret = err;
        }

diff --git a/include/linux/fs.h b/include/linux/fs.h
index e6b2de159736c44ae0bfb605faed1ad6ad2b1121..310ca1ed9293fc32bbd850eaa472a056c4eab1e7 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -323,6 +323,8 @@ struct writeback_control;
 #define IOCB_APPEND            (1 << 1)
 #define IOCB_DIRECT            (1 << 2)
 #define IOCB_HIPRI             (1 << 3)
+#define IOCB_DSYNC             (1 << 4)
+#define IOCB_SYNC              (1 << 5)
 
 struct kiocb {
        struct file             *ki_filp;
@@ -2485,12 +2487,12 @@ extern int filemap_fdatawrite_range(struct address_space *mapping,
 extern int vfs_fsync_range(struct file *file, loff_t start, loff_t end,
                           int datasync);
 extern int vfs_fsync(struct file *file, int datasync);
-static inline int generic_write_sync(struct file *file, loff_t pos, loff_t count)
+static inline int generic_write_sync(struct kiocb *iocb, loff_t pos, loff_t count)
 {
-       if (!(file->f_flags & O_DSYNC) && !IS_SYNC(file->f_mapping->host))
+       if (!(iocb->ki_flags & IOCB_DSYNC))
                return 0;
-       return vfs_fsync_range(file, pos, pos + count - 1,
-                              (file->f_flags & __O_SYNC) ? 0 : 1);
+       return vfs_fsync_range(iocb->ki_filp, pos, pos + count - 1,
+                              (iocb->ki_flags & IOCB_SYNC) ? 0 : 1);
 }
 extern void emergency_sync(void);
 extern void emergency_remount(void);
@@ -2942,6 +2944,10 @@ static inline int iocb_flags(struct file *file)
                res |= IOCB_APPEND;
        if (io_is_direct(file))
                res |= IOCB_DIRECT;
+       if ((file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host))
+               res |= IOCB_DSYNC;
+       if (file->f_flags & __O_SYNC)
+               res |= IOCB_SYNC;
        return res;
 }
 

diff --git a/mm/filemap.c b/mm/filemap.c
index cb36db9f410703b6d0e757ae6b6a818c4b04d421..8345d6d3436ac4cc862f1aa1311a992a841a4d8c 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2794,7 +2794,7 @@ ssize_t generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
        if (ret > 0) {
                ssize_t err;
 
-               err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+               err = generic_write_sync(iocb, iocb->ki_pos - ret, ret);
                if (err < 0)
                        ret = err;
        }