From 2f15f9e60ef6f8ebb84181db1dfc017f52b6d839 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 May 2021 10:38:27 +0200 Subject: [PATCH] fix up queue-5.10/btrfs-fix-race-leading-to-unpersisted-data-and-metadata-on-fsync.patch --- ...to-unpersisted-data-and-metadata-on-fsync.patch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/queue-5.10/btrfs-fix-race-leading-to-unpersisted-data-and-metadata-on-fsync.patch b/queue-5.10/btrfs-fix-race-leading-to-unpersisted-data-and-metadata-on-fsync.patch index 37f243720cb..72aaa87e93b 100644 --- a/queue-5.10/btrfs-fix-race-leading-to-unpersisted-data-and-metadata-on-fsync.patch +++ b/queue-5.10/btrfs-fix-race-leading-to-unpersisted-data-and-metadata-on-fsync.patch @@ -201,9 +201,9 @@ Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- - fs/btrfs/file.c | 35 +++++++++++++++++++++++++---------- + fs/btrfs/file.c | 36 +++++++++++++++++++++++++----------- fs/btrfs/tree-log.c | 3 ++- - 2 files changed, 27 insertions(+), 11 deletions(-) + 2 files changed, 27 insertions(+), 12 deletions(-) --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -238,7 +238,15 @@ Signed-off-by: Greg Kroah-Hartman /* * fsync call for both files and directories. This logs the inode into * the tree log instead of forcing full commits whenever possible. -@@ -2187,17 +2211,8 @@ int btrfs_sync_file(struct file *file, l +@@ -2080,7 +2104,6 @@ int btrfs_sync_file(struct file *file, l + { + struct dentry *dentry = file_dentry(file); + struct inode *inode = d_inode(dentry); +- struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); + struct btrfs_root *root = BTRFS_I(inode)->root; + struct btrfs_trans_handle *trans; + struct btrfs_log_ctx ctx; +@@ -2187,17 +2210,8 @@ int btrfs_sync_file(struct file *file, l atomic_inc(&root->log_batch); -- 2.47.3