From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965331AbdAJK57 (ORCPT ); Tue, 10 Jan 2017 05:57:59 -0500 Received: from mx2.suse.de ([195.135.220.15]:53815 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754023AbdAJK55 (ORCPT ); Tue, 10 Jan 2017 05:57:57 -0500 Date: Tue, 10 Jan 2017 11:57:55 +0100 From: Jan Kara To: Fabian Frederick Cc: Jan Kara , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 10/12 linux-next] udf: atomically read inode size Message-ID: <20170110105755.GJ4991@quack2.suse.cz> References: <1483736037-25111-1-git-send-email-fabf@skynet.be> <1483736083-25193-1-git-send-email-fabf@skynet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1483736083-25193-1-git-send-email-fabf@skynet.be> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri 06-01-17 21:54:41, Fabian Frederick wrote: > See i_size_read() comments in include/linux/fs.h > > Signed-off-by: Fabian Frederick Applied. Thanks! Honza > --- > fs/udf/lowlevel.c | 2 +- > fs/udf/super.c | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c > index 6ad5a45..5c7ec12 100644 > --- a/fs/udf/lowlevel.c > +++ b/fs/udf/lowlevel.c > @@ -58,7 +58,7 @@ unsigned long udf_get_last_block(struct super_block *sb) > */ > if (ioctl_by_bdev(bdev, CDROM_LAST_WRITTEN, (unsigned long) &lblock) || > lblock == 0) > - lblock = bdev->bd_inode->i_size >> sb->s_blocksize_bits; > + lblock = i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits; > > if (lblock) > return lblock - 1; > diff --git a/fs/udf/super.c b/fs/udf/super.c > index 9256117..6b5a1a4 100644 > --- a/fs/udf/super.c > +++ b/fs/udf/super.c > @@ -1213,7 +1213,8 @@ static int udf_load_vat(struct super_block *sb, int p_index, int type1_index) > struct udf_inode_info *vati; > uint32_t pos; > struct virtualAllocationTable20 *vat20; > - sector_t blocks = sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits; > + sector_t blocks = i_size_read(sb->s_bdev->bd_inode) >> > + sb->s_blocksize_bits; > > udf_find_vat_block(sb, p_index, type1_index, sbi->s_last_block); > if (!sbi->s_vat_inode && > @@ -1803,7 +1804,7 @@ static int udf_check_anchor_block(struct super_block *sb, sector_t block, > > if (UDF_QUERY_FLAG(sb, UDF_FLAG_VARCONV) && > udf_fixed_to_variable(block) >= > - sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits) > + i_size_read(sb->s_bdev->bd_inode) >> sb->s_blocksize_bits) > return -EAGAIN; > > bh = udf_read_tagged(sb, block, block, &ident); > @@ -1865,7 +1866,7 @@ static int udf_scan_anchors(struct super_block *sb, sector_t *lastblock, > last[last_count++] = *lastblock - 152; > > for (i = 0; i < last_count; i++) { > - if (last[i] >= sb->s_bdev->bd_inode->i_size >> > + if (last[i] >= i_size_read(sb->s_bdev->bd_inode) >> > sb->s_blocksize_bits) > continue; > ret = udf_check_anchor_block(sb, last[i], fileset); > -- > 2.7.4 > > -- Jan Kara SUSE Labs, CR