Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d0b0bd4 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: simplfy a field name in struct f2fs_extent,extent_info 



Rename a filed name from 'blk_addr' to 'blk' in struct {f2fs_extent,extent_info}
as annotation of this field descripts its meaning well to us.

By this way, we can avoid long statement in code of following patches.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 0c872e2d

fs/f2fs/data.c

+6 −7
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs, 


	start_fofs = fi->ext.fofs;

	end_fofs = fi->ext.fofs + fi->ext.len - 1;

	start_blkaddr = fi->ext.blk_addr;

	start_blkaddr = fi->ext.blk;



	if (pgofs >= start_fofs && pgofs <= end_fofs) {

		unsigned int blkbits = inode->i_sb->s_blocksize_bits;
@@ -313,8 +313,8 @@ void update_extent_cache(struct dnode_of_data *dn) 


	start_fofs = fi->ext.fofs;

	end_fofs = fi->ext.fofs + fi->ext.len - 1;

	start_blkaddr = fi->ext.blk_addr;

	end_blkaddr = fi->ext.blk_addr + fi->ext.len - 1;

	start_blkaddr = fi->ext.blk;

	end_blkaddr = fi->ext.blk + fi->ext.len - 1;



	/* Drop and initialize the matched extent */

	if (fi->ext.len == 1 && fofs == start_fofs)
@@ -324,7 +324,7 @@ void update_extent_cache(struct dnode_of_data *dn) 
	if (fi->ext.len == 0) {

		if (dn->data_blkaddr != NULL_ADDR) {

			fi->ext.fofs = fofs;

			fi->ext.blk_addr = dn->data_blkaddr;

			fi->ext.blk = dn->data_blkaddr;

			fi->ext.len = 1;

		}

		goto end_update;
@@ -333,7 +333,7 @@ void update_extent_cache(struct dnode_of_data *dn) 
	/* Front merge */

	if (fofs == start_fofs - 1 && dn->data_blkaddr == start_blkaddr - 1) {

		fi->ext.fofs--;

		fi->ext.blk_addr--;

		fi->ext.blk--;

		fi->ext.len++;

		goto end_update;

	}
@@ -351,8 +351,7 @@ void update_extent_cache(struct dnode_of_data *dn) 
			fi->ext.len = fofs - start_fofs;

		} else {

			fi->ext.fofs = fofs + 1;

			fi->ext.blk_addr = start_blkaddr +

					fofs - start_fofs + 1;

			fi->ext.blk = start_blkaddr + fofs - start_fofs + 1;

			fi->ext.len -= fofs - start_fofs + 1;

		}

	} else {

fs/f2fs/f2fs.h

+3 −3
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ enum { 


struct extent_info {

	unsigned int fofs;	/* start offset in a file */

	u32 blk_addr;		/* start block address of the extent */

	u32 blk;		/* start block address of the extent */

	unsigned int len;	/* length of the extent */

};
@@ -320,7 +320,7 @@ static inline void get_extent_info(struct extent_info *ext, 
					struct f2fs_extent i_ext)

{

	ext->fofs = le32_to_cpu(i_ext.fofs);

	ext->blk_addr = le32_to_cpu(i_ext.blk_addr);

	ext->blk = le32_to_cpu(i_ext.blk);

	ext->len = le32_to_cpu(i_ext.len);

}
@@ -328,7 +328,7 @@ static inline void set_raw_extent(struct extent_info *ext, 
					struct f2fs_extent *i_ext)

{

	i_ext->fofs = cpu_to_le32(ext->fofs);

	i_ext->blk_addr = cpu_to_le32(ext->blk_addr);

	i_ext->blk = cpu_to_le32(ext->blk);

	i_ext->len = cpu_to_le32(ext->len);

}

include/linux/f2fs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ struct f2fs_orphan_block { 
 */

struct f2fs_extent {

	__le32 fofs;		/* start file offset of the extent */

	__le32 blk_addr;	/* start block address of the extent */

	__le32 blk;		/* start block address of the extent */

	__le32 len;		/* lengh of the extent */

} __packed;