mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: Fabian Frederick <fabf@skynet.be>
Cc: Jan Kara <jack@suse.com>,
	linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 10/12 linux-next] udf: atomically read inode size
Date: Tue, 10 Jan 2017 11:57:55 +0100	[thread overview]
Message-ID: <20170110105755.GJ4991@quack2.suse.cz> (raw)
In-Reply-To: <1483736083-25193-1-git-send-email-fabf@skynet.be>

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 <fabf@skynet.be>

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 <jack@suse.com>
SUSE Labs, CR

  parent reply	other threads:[~2017-01-10 10:57 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-06 20:53 [PATCH 00/12 linux-next] udf: clean-up Fabian Frederick
2017-01-06 20:53 ` [PATCH 01/12 linux-next] udf: use __packed instead of __attribute__ ((packed)) Fabian Frederick
2017-01-10 10:29   ` Jan Kara
2017-01-06 20:53 ` [PATCH 02/12 linux-next] udf: use pointer for kernel_long_ad argument Fabian Frederick
2017-01-10 10:33   ` Jan Kara
2017-01-06 20:53 ` [PATCH 03/12 linux-next] udf: merge bh free Fabian Frederick
2017-01-10 10:36   ` Jan Kara
2017-01-06 20:53 ` [PATCH 04/12 linux-next] udf: remove unneeded line break Fabian Frederick
2017-01-10 10:37   ` Jan Kara
2017-01-06 20:53 ` [PATCH 05/12 linux-next] udf: remove empty condition Fabian Frederick
2017-01-10 10:37   ` Jan Kara
2017-01-06 20:53 ` [PATCH 06/12 linux-next] udf: add udf_ajust_time Fabian Frederick
2017-01-10 10:44   ` Jan Kara
2017-01-06 20:53 ` [PATCH 07/12 linux-next] udf: store allocation offset in udf_prealloc_extents() Fabian Frederick
2017-01-10 10:53   ` Jan Kara
2017-01-06 20:53 ` [PATCH 08/12 linux-next] udf: remove next_epos from udf_update_extent_cache() Fabian Frederick
2017-01-10 10:55   ` Jan Kara
2017-01-06 20:53 ` [PATCH 09/12 linux-next] udf: merge module informations in super.c Fabian Frederick
2017-01-10 10:55   ` Jan Kara
2017-01-06 20:54 ` [PATCH 10/12 linux-next] udf: atomically read inode size Fabian Frederick
2017-01-06 20:54   ` [PATCH 11/12 linux-next] udf: replace 0xFFFFFFFF by ~0 Fabian Frederick
2017-01-06 20:54   ` [PATCH 12/12 linux-next] udf: check partition reference in udf_read_inode() Fabian Frederick
2017-01-10 10:59     ` Jan Kara
2017-01-10 10:57   ` Jan Kara [this message]
2017-01-10 11:00 ` [PATCH 00/12 linux-next] udf: clean-up Jan Kara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170110105755.GJ4991@quack2.suse.cz \
    --to=jack@suse.cz \
    --cc=fabf@skynet.be \
    --cc=jack@suse.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome