]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: treat RWF_{,D}SYNC writes as sync for CRCs
authorOmar Sandoval <osandov@fb.com>
Thu, 15 Aug 2019 21:04:03 +0000 (14:04 -0700)
committerDavid Sterba <dsterba@suse.com>
Mon, 9 Sep 2019 12:59:17 +0000 (14:59 +0200)
The VFS indicates a synchronous write to ->write_iter() via
iocb->ki_flags. The IOCB_{,D}SYNC flags may be set based on the file
(see iocb_flags()) or the RWF_* flags passed to a syscall like
pwritev2() (see kiocb_set_rw_flags()).

However, in btrfs_file_write_iter(), we're checking if a write is
synchronous based only on the file; we use this to decide when to bump
the sync_writers counter and thus do CRCs synchronously. Make sure we do
this for all synchronous writes as determined by the VFS.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ add const ]
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/file.c

index 25df5b03b591f78f768fd049e1935e31f2bf6c9d..702c30a28a43eae801a9a29ea3ad28c86dce2625 100644 (file)
@@ -1882,7 +1882,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
        u64 start_pos;
        u64 end_pos;
        ssize_t num_written = 0;
-       bool sync = (file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host);
+       const bool sync = iocb->ki_flags & IOCB_DSYNC;
        ssize_t err;
        loff_t pos;
        size_t count;