From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com ([74.125.82.65]:37701 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755344AbdJJLAX (ORCPT ); Tue, 10 Oct 2017 07:00:23 -0400 Subject: Re: [PATCH] btrfs: use appropriate replacements for __sb_{start,end}_write calls To: Rakesh Pandit , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: David Sterba , Josef Bacik , Chris Mason References: <20171010104803.GA33133@dhcp-216.srv.tuxera.com> From: Nikolay Borisov Message-ID: Date: Tue, 10 Oct 2017 14:00:20 +0300 MIME-Version: 1.0 In-Reply-To: <20171010104803.GA33133@dhcp-216.srv.tuxera.com> Content-Type: text/plain; charset=utf-8 Sender: linux-btrfs-owner@vger.kernel.org List-ID: On 10.10.2017 13:48, Rakesh Pandit wrote: > 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 > --- > fs/btrfs/super.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c > index 35a128a..99c21ae 100644 > --- 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); The non __ versions are just wrappers around the __ specific calls. So the code is identical. Reviewed-by: Nikolay Borisov