diff options
| author | Chao Yu <chao2.yu@samsung.com> | 2014-09-04 12:11:47 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-09 22:15:05 +0200 |
| commit | d3a14afd5ed1970519a2d6ed59f4062ec3ba821f (patch) | |
| tree | b768516a46c5a88090c34eed158ace6083ec7a25 /fs/f2fs | |
| parent | f2fs: need fsck.f2fs if the recovery was failed (diff) | |
| download | linux-d3a14afd5ed1970519a2d6ed59f4062ec3ba821f.tar.xz linux-d3a14afd5ed1970519a2d6ed59f4062ec3ba821f.zip | |
f2fs: remove unneeded sit_i in macro SIT_BLOCK_OFFSET/START_SEGNO
sit_i in macro SIT_BLOCK_OFFSET/START_SEGNO is not used, remove it.
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/segment.c | 4 | ||||
| -rw-r--r-- | fs/f2fs/segment.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 853c8f5445fd..a6b90a520894 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1403,7 +1403,7 @@ static struct page *get_current_sit_page(struct f2fs_sb_info *sbi, unsigned int segno) { struct sit_info *sit_i = SIT_I(sbi); - unsigned int offset = SIT_BLOCK_OFFSET(sit_i, segno); + unsigned int offset = SIT_BLOCK_OFFSET(segno); block_t blk_addr = sit_i->sit_base_addr + offset; check_seg_range(sbi, segno); @@ -1518,7 +1518,7 @@ to_sit_page: page = NULL; } - start = START_SEGNO(sit_i, segno); + start = START_SEGNO(segno); end = start + SIT_ENTRY_PER_BLOCK - 1; /* read sit block that will be updated */ diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index d163fc854ac1..2548bfdf0240 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -77,10 +77,10 @@ #define SIT_ENTRY_OFFSET(sit_i, segno) \ (segno % sit_i->sents_per_block) -#define SIT_BLOCK_OFFSET(sit_i, segno) \ +#define SIT_BLOCK_OFFSET(segno) \ (segno / SIT_ENTRY_PER_BLOCK) -#define START_SEGNO(sit_i, segno) \ - (SIT_BLOCK_OFFSET(sit_i, segno) * SIT_ENTRY_PER_BLOCK) +#define START_SEGNO(segno) \ + (SIT_BLOCK_OFFSET(segno) * SIT_ENTRY_PER_BLOCK) #define SIT_BLK_CNT(sbi) \ ((TOTAL_SEGS(sbi) + SIT_ENTRY_PER_BLOCK - 1) / SIT_ENTRY_PER_BLOCK) #define f2fs_bitmap_size(nr) \ @@ -624,7 +624,7 @@ static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi, unsigned int start) { struct sit_info *sit_i = SIT_I(sbi); - unsigned int offset = SIT_BLOCK_OFFSET(sit_i, start); + unsigned int offset = SIT_BLOCK_OFFSET(start); block_t blk_addr = sit_i->sit_base_addr + offset; check_seg_range(sbi, start); @@ -651,7 +651,7 @@ static inline pgoff_t next_sit_addr(struct f2fs_sb_info *sbi, static inline void set_to_next_sit(struct sit_info *sit_i, unsigned int start) { - unsigned int block_off = SIT_BLOCK_OFFSET(sit_i, start); + unsigned int block_off = SIT_BLOCK_OFFSET(start); if (f2fs_test_bit(block_off, sit_i->sit_bitmap)) f2fs_clear_bit(block_off, sit_i->sit_bitmap); |