btrfs: rename BTRFS_INODE_ORDERED_DATA_CLOSE flag

Commit 8d875f95da43 ("btrfs: disable strict file flushes for
renames and truncates") eliminated the notion of ordered operations and
instead BTRFS_INODE_ORDERED_DATA_CLOSE only remained as a flag
indicating that a file's content should be synced to disk in case a
file is truncated and any writes happen to it concurrently. In fact
this intendend behavior was broken until it was fixed in
f6dc45c7a93a ("Btrfs: fix filemap_flush call in btrfs_file_release").

All things considered let's give the flag a more descriptive name. Also
slightly reword comments.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 738009a2232011d4a2fbe327f71fa90c98e90b77..92dd86bceae310197f66f13cc790c4bc17c5e480 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -21,7 +21,7 @@
  * new data the application may have written before commit.
  */
 enum {
-       BTRFS_INODE_ORDERED_DATA_CLOSE,
+       BTRFS_INODE_FLUSH_ON_CLOSE,
        BTRFS_INODE_DUMMY,
        BTRFS_INODE_IN_DEFRAG,
        BTRFS_INODE_HAS_ASYNC_EXTENT,

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 038e0afaf3d04a08baff9f91c2abbd154623e8c6..0ff659455b1ebc8588ef781cab448294579b14ba 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2091,12 +2091,12 @@ int btrfs_release_file(struct inode *inode, struct file *filp)
        filp->private_data = NULL;
 
        /*
-        * ordered_data_close is set by setattr when we are about to truncate
-        * a file from a non-zero size to a zero size.  This tries to
-        * flush down new bytes that may have been written if the
-        * application were using truncate to replace a file in place.
+        * Set by setattr when we are about to truncate a file from a non-zero
+        * size to a zero size.  This tries to flush down new bytes that may
+        * have been written if the application were using truncate to replace
+        * a file in place.
         */
-       if (test_and_clear_bit(BTRFS_INODE_ORDERED_DATA_CLOSE,
+       if (test_and_clear_bit(BTRFS_INODE_FLUSH_ON_CLOSE,
                               &BTRFS_I(inode)->runtime_flags))
                        filemap_flush(inode->i_mapping);
        return 0;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 36efed0a24deb827d27ef72c0a2e007bce4a019c..936c3137c6467d30e8bca4fdb6398e51b11c52ae 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4835,11 +4835,11 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
 
                /*
                 * We're truncating a file that used to have good data down to
-                * zero. Make sure it gets into the ordered flush list so that
-                * any new writes get down to disk quickly.
+                * zero. Make sure any new writes to the file get on disk
+                * on close.
                 */
                if (newsize == 0)
-                       set_bit(BTRFS_INODE_ORDERED_DATA_CLOSE,
+                       set_bit(BTRFS_INODE_FLUSH_ON_CLOSE,
                                &BTRFS_I(inode)->runtime_flags);
 
                truncate_setsize(inode, newsize);