fat: introduce a helper fat_get_blknr_offset()
Subsystems (2)
PATCH v7 3/7 fat: introduce a helper fat_get_blknr_offset()
From: Namjae Jeon <[email protected]>
Introduce helper function to get the block number and offset for a given i_pos value. Use it in __fat_write_inode() now and later on in nfs.c
Signed-off-by Namjae Jeon <[email protected]>
Signed-off-by Ravishankar N <[email protected]>
Signed-off-by Amit Sahrawat <[email protected]>
--- fs/fat/fat.h | 7 +++++++ fs/fat/inode.c | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-)
fs/fat/fat.h +7 -0
@@ -218,6 +218,13 @@ static inline sector_t fat_clus_to_blknr(struct msdos_sb_info *sbi, int clus) + sbi->data_start; } +static inline void fat_get_blknr_offset (struct msdos_sb_info *sbi, +loff_t i_pos,sector_t *blknr,int *offset) +{ + *blknr = i_pos >> sbi->dir_per_block_bits; + *offset = i_pos & (sbi->dir_per_block -1 ); +} +static inline loff_t fat_i_pos_read (struct msdos_sb_info *sbi,struct inode *inode) {
fs/fat/inode.c +5 -4
@@ -663,7 +663,8 @@ static int __fat_write_inode(struct inode *inode, int wait)struct buffer_head *bh;struct msdos_dir_entry *raw_entry;loff_t i_pos; -int err; +sector_t blocknr; +int err, offset;if (inode->i_ino ==MSDOS_ROOT_INO )return 0 ;
@@ -673,7 +674,8 @@ retry:if (!i_pos)return 0 ; - bh =sb_bread (sb, i_pos >> sbi->dir_per_block_bits); +fat_get_blknr_offset (sbi, i_pos, &blocknr, &offset); + bh =sb_bread (sb, blocknr);if (!bh) {fat_msg (sb,KERN_ERR ,"unable to read inode block " "for updating (i_pos %lld)" , i_pos);
@@ -686,8 +688,7 @@ retry: goto retry; } - raw_entry = &((struct msdos_dir_entry *) (bh->b_data)) - [i_pos & (sbi->dir_per_block -1 )]; + raw_entry = &((struct msdos_dir_entry *) (bh->b_data))[offset];if (S_ISDIR (inode->i_mode)) raw_entry->size =0 ;else
Signature · 1 line
1.7.9.5