From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from aserp2120.oracle.com ([141.146.126.78]:45088 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751003AbeAVEKo (ORCPT ); Sun, 21 Jan 2018 23:10:44 -0500 From: Anand Jain Subject: Re: [PATCH 1/3] btrfs: make code easy to read in btrfs_open_one_device() To: dsterba@suse.cz, linux-btrfs@vger.kernel.org References: <20171215074016.26461-1-anand.jain@oracle.com> <20180105140915.GL3553@twin.jikos.cz> Message-ID: <851cdeca-2b4a-2b01-862e-c9c9ec96cec0@oracle.com> Date: Mon, 22 Jan 2018 12:11:50 +0800 MIME-Version: 1.0 In-Reply-To: <20180105140915.GL3553@twin.jikos.cz> Content-Type: text/plain; charset=utf-8; format=flowed Sender: linux-btrfs-owner@vger.kernel.org List-ID: On 01/05/2018 10:09 PM, David Sterba wrote: > On Fri, Dec 15, 2017 at 03:40:14PM +0800, Anand Jain wrote: >> No functional change. First set the usual case, writeable then check >> for any special config. >> >> Signed-off-by: Anand Jain >> --- >> fs/btrfs/volumes.c | 8 +++----- >> 1 file changed, 3 insertions(+), 5 deletions(-) >> >> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c >> index 5a4c30451c7f..a81574dba124 100644 >> --- a/fs/btrfs/volumes.c >> +++ b/fs/btrfs/volumes.c >> @@ -676,14 +676,12 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, >> >> device->generation = btrfs_super_generation(disk_super); >> >> + set_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); > > I would not say there's no functional change. This line will > unconditionally set the writeable flag, but this was not the case > before. (Sorry for the delay, got distracted by other patches). agreed here. > Sure it's dropped a few lines below, but this would need some checking > that it's not a problem. btrfs_open_one_device is indirectly called from > mount so it should be safe (we can't use one device twice), but this > needs to be documented. Sure will do. Thanks, Anand >> if (btrfs_super_flags(disk_super) & BTRFS_SUPER_FLAG_SEEDING) { >> clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); >> fs_devices->seeding = 1; >> - } else { >> - if (bdev_read_only(bdev)) >> - clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); >> - else >> - set_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); >> + } else if (bdev_read_only(bdev)) { >> + clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); >> } >> >> q = bdev_get_queue(bdev); >> -- >> 2.7.0 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html