summary refs log tree commit diff
path: root/fs/fat
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-11-01 10:25:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-11-01 10:25:27 -0700
commit19901165d90fdca1e57c9baa0d5b4c63d15c476a (patch)
tree340d5373dbc740591fe6f1d6724eca3b27609a40 /fs/fat
parentb6773cdb0e9fa75993946753d12f05eb3bbf3bce (diff)
parent1e03a36bdff4709c1bbf0f57f60ae3f776d51adf (diff)
downloadlinux-19901165d90fdca1e57c9baa0d5b4c63d15c476a.tar.gz
Merge tag 'for-5.16/inode-sync-2021-10-29' of git://git.kernel.dk/linux-block
Pull block inode sync updates from Jens Axboe:
 "This contains improvements to how bdev inode syncing is handled,
  unifying the API"

* tag 'for-5.16/inode-sync-2021-10-29' of git://git.kernel.dk/linux-block:
  block: simplify the block device syncing code
  ntfs3: use sync_blockdev_nowait
  fat: use sync_blockdev_nowait
  btrfs: use sync_blockdev
  xen-blkback: use sync_blockdev
  block: remove __sync_blockdev
  fs: remove __sync_filesystem
Diffstat (limited to 'fs/fat')
-rw-r--r--fs/fat/inode.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 9f3cd03668ad..a6f1c6d426d1 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1940,10 +1940,8 @@ int fat_flush_inodes(struct super_block *sb, struct inode *i1, struct inode *i2)
 		ret = writeback_inode(i1);
 	if (!ret && i2)
 		ret = writeback_inode(i2);
-	if (!ret) {
-		struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping;
-		ret = filemap_flush(mapping);
-	}
+	if (!ret)
+		ret = sync_blockdev_nowait(sb->s_bdev);
 	return ret;
 }
 EXPORT_SYMBOL_GPL(fat_flush_inodes);