| Message ID | 1483736037-25111-9-git-send-email-fabf@skynet.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 > >
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;
udf_update_extent_cache() is only called from inode_bmap() with 1 for next_epos Signed-off-by: Fabian Frederick <fabf@skynet.be> --- fs/udf/inode.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)