From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 912542C81 for ; Tue, 23 Nov 2021 22:54:48 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 4FDCD60F5B; Tue, 23 Nov 2021 22:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637708088; bh=u2lqdKGssL3PFQYc1p9ovLLGOLDvbfIo8L6k2g+j8/Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fiDrCeIYWisczQAnoc1pHa2hEiYS7fcUcSDBhfwV3mwv3UzsY4CXEzNg4rwjPtN2K melGoMO7lUvTIIuP0FQj1qr1HXwwMeb5MN7C8y6dyJERNmVA0v3hoJcv6ZFcsIGmnt /9brMCtm3rLalc0hQwS31cpWa0XkEJ69btMrxk56vjvS+hl/AGI//1YzkY7gjjAIvV t0zReHcaFkXKQWcEb67dQGWoZPjVM/EyA/W+pV1T3OFQxMMu8Z41zc43Z78GicC5um ftheaT3WHNw2tYmgoagJnVyOi1SfhbNc+8s6U6lQOHOh+szOVxmeKsWoGNRoX1smAD zh9Mw7ofmx7Jg== Date: Tue, 23 Nov 2021 14:54:48 -0800 From: "Darrick J. Wong" To: Christoph Hellwig Cc: Dan Williams , Mike Snitzer , Ira Weiny , dm-devel@redhat.com, linux-xfs@vger.kernel.org, nvdimm@lists.linux.dev, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH 19/29] ext2: cleanup the dax handling in ext2_fill_super Message-ID: <20211123225448.GO266024@magnolia> References: <20211109083309.584081-1-hch@lst.de> <20211109083309.584081-20-hch@lst.de> Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211109083309.584081-20-hch@lst.de> On Tue, Nov 09, 2021 at 09:32:59AM +0100, Christoph Hellwig wrote: > Only call fs_dax_get_by_bdev once the sbi has been allocated and remove > the need for the dax_dev local variable. > > Signed-off-by: Christoph Hellwig Looks good, Reviewed-by: Darrick J. Wong --D > --- > fs/ext2/super.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/fs/ext2/super.c b/fs/ext2/super.c > index a964066a80aa7..7e23482862e69 100644 > --- a/fs/ext2/super.c > +++ b/fs/ext2/super.c > @@ -802,7 +802,6 @@ static unsigned long descriptor_loc(struct super_block *sb, > > static int ext2_fill_super(struct super_block *sb, void *data, int silent) > { > - struct dax_device *dax_dev = fs_dax_get_by_bdev(sb->s_bdev); > struct buffer_head * bh; > struct ext2_sb_info * sbi; > struct ext2_super_block * es; > @@ -822,17 +821,17 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) > > sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); > if (!sbi) > - goto failed; > + return -ENOMEM; > > sbi->s_blockgroup_lock = > kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL); > if (!sbi->s_blockgroup_lock) { > kfree(sbi); > - goto failed; > + return -ENOMEM; > } > sb->s_fs_info = sbi; > sbi->s_sb_block = sb_block; > - sbi->s_daxdev = dax_dev; > + sbi->s_daxdev = fs_dax_get_by_bdev(sb->s_bdev); > > spin_lock_init(&sbi->s_lock); > ret = -EINVAL; > @@ -946,7 +945,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) > blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size); > > if (test_opt(sb, DAX)) { > - if (!dax_dev) { > + if (!sbi->s_daxdev) { > ext2_msg(sb, KERN_ERR, > "DAX unsupported by block device. Turning off DAX."); > clear_opt(sbi->s_mount_opt, DAX); > @@ -1201,11 +1200,10 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) > failed_mount: > brelse(bh); > failed_sbi: > + fs_put_dax(sbi->s_daxdev); > sb->s_fs_info = NULL; > kfree(sbi->s_blockgroup_lock); > kfree(sbi); > -failed: > - fs_put_dax(dax_dev); > return ret; > } > > -- > 2.30.2 >