Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1555154

Re: [PATCH 08/12 linux-next] udf: remove next_epos from udf_update_extent_cache()

Show all headers | View raw

On Fri 06-01-17 21:53:56, Fabian Frederick wrote:
> udf_update_extent_cache() is only called from inode_bmap()
> with 1 for next_epos
> 
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Thanks. Applied.

								Honza

> ---
>  fs/udf/inode.c | 23 +++++++++++------------
>  1 file changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/udf/inode.c b/fs/udf/inode.c
> index 66514ad..2327f72 100644
> --- a/fs/udf/inode.c
> +++ b/fs/udf/inode.c
> @@ -109,7 +109,7 @@ static int udf_read_extent_cache(struct inode *inode, loff_t bcount,
>  
>  /* Add extent to extent cache */
>  static void udf_update_extent_cache(struct inode *inode, loff_t estart,
> -				    struct extent_position *pos, int next_epos)
> +				    struct extent_position *pos)
>  {
>  	struct udf_inode_info *iinfo = UDF_I(inode);
>  
> @@ -121,16 +121,15 @@ static void udf_update_extent_cache(struct inode *inode, loff_t estart,
>  	memcpy(&iinfo->cached_extent.epos, pos,
>  	       sizeof(struct extent_position));
>  	iinfo->cached_extent.lstart = estart;
> -	if (next_epos)
> -		switch (iinfo->i_alloc_type) {
> -		case ICBTAG_FLAG_AD_SHORT:
> -			iinfo->cached_extent.epos.offset -=
> -			sizeof(struct short_ad);
> -			break;
> -		case ICBTAG_FLAG_AD_LONG:
> -			iinfo->cached_extent.epos.offset -=
> -			sizeof(struct long_ad);
> -		}
> +	switch (iinfo->i_alloc_type) {
> +	case ICBTAG_FLAG_AD_SHORT:
> +		iinfo->cached_extent.epos.offset -=
> +		sizeof(struct short_ad);
> +		break;
> +	case ICBTAG_FLAG_AD_LONG:
> +		iinfo->cached_extent.epos.offset -=
> +		sizeof(struct long_ad);
> +	}
>  	spin_unlock(&iinfo->i_extent_cache_lock);
>  }
>  
> @@ -2286,7 +2285,7 @@ int8_t inode_bmap(struct inode *inode, sector_t block,
>  		lbcount += *elen;
>  	} while (lbcount <= bcount);
>  	/* update extent cache */
> -	udf_update_extent_cache(inode, lbcount - *elen, pos, 1);
> +	udf_update_extent_cache(inode, lbcount - *elen, pos);
>  	*offset = (bcount + *elen - lbcount) >> blocksize_bits;
>  
>  	return etype;
> -- 
> 2.7.4
> 
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/12 linux-next] udf: clean-up Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
  [PATCH 09/12 linux-next] udf: merge module informations in super.c Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
    Re: [PATCH 09/12 linux-next] udf: merge module informations in  super.c Jan Kara <jack@suse.cz> - 2017-01-10 12:00 +0100
  [PATCH 04/12 linux-next] udf: remove unneeded line break Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
    Re: [PATCH 04/12 linux-next] udf: remove unneeded line break Jan Kara <jack@suse.cz> - 2017-01-10 11:40 +0100
  [PATCH 05/12 linux-next] udf: remove empty condition Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
    Re: [PATCH 05/12 linux-next] udf: remove empty condition Jan Kara <jack@suse.cz> - 2017-01-10 11:40 +0100
  [PATCH 08/12 linux-next] udf: remove next_epos from udf_update_extent_cache() Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
    Re: [PATCH 08/12 linux-next] udf: remove next_epos from  udf_update_extent_cache() Jan Kara <jack@suse.cz> - 2017-01-10 12:00 +0100
  [PATCH 01/12 linux-next] udf: use __packed instead of __attribute__ ((packed)) Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
    Re: [PATCH 01/12 linux-next] udf: use __packed instead of  __attribute__ ((packed)) Jan Kara <jack@suse.cz> - 2017-01-10 11:40 +0100
  [PATCH 02/12 linux-next] udf: use pointer for kernel_long_ad argument Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
    Re: [PATCH 02/12 linux-next] udf: use pointer for kernel_long_ad  argument Jan Kara <jack@suse.cz> - 2017-01-10 11:40 +0100
  [PATCH 10/12 linux-next] udf: atomically read inode size Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
    [PATCH 11/12 linux-next] udf: replace 0xFFFFFFFF by ~0 Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
    Re: [PATCH 10/12 linux-next] udf: atomically read inode size Jan Kara <jack@suse.cz> - 2017-01-10 12:00 +0100
  [PATCH 07/12 linux-next] udf: store allocation offset in udf_prealloc_extents() Fabian Frederick <fabf@skynet.be> - 2017-01-06 22:00 +0100
    Re: [PATCH 07/12 linux-next] udf: store allocation offset in  udf_prealloc_extents() Jan Kara <jack@suse.cz> - 2017-01-10 12:00 +0100
  Re: [PATCH 00/12 linux-next] udf: clean-up Jan Kara <jack@suse.cz> - 2017-01-10 12:10 +0100

csiph-web