btrfs: use appropriate replacements for __sb_{start,end}_write calls

Commit a53f4f8e9c8eb ("btrfs: Don't call btrfs_start_transaction() on
frozen fs to avoid deadlock.") started using internal calls and we
replace them with more suitable ones.

Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
Reviewed-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/super.c b/fs/btrfs/super.c
index f092fe057de78dc7f9eea4122e3ff2ac4e5bc584..770ac088dd9ccd1ccb5850b8345581f404f67d7f 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1205,8 +1205,8 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
                         * happens. The pending operations are delayed to the
                         * next commit after thawing.
                         */
-                       if (__sb_start_write(sb, SB_FREEZE_WRITE, false))
-                               __sb_end_write(sb, SB_FREEZE_WRITE);
+                       if (sb_start_write_trylock(sb))
+                               sb_end_write(sb);
                        else
                                return 0;
                        trans = btrfs_start_transaction(root, 0);