diff options
| author | Chao Yu <yuchao0@huawei.com> | 2018-04-24 10:55:28 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-05-31 11:31:49 -0700 |
| commit | b2532c694033fb6762478846c457382061f9f630 (patch) | |
| tree | 2efb28d6f943201ee1a387fd558aaad4e7079ad5 /fs/f2fs/gc.c | |
| parent | b82f6e347bfb68920d7e611553e1f3170ee4608c (diff) | |
| download | op-kernel-dev-b2532c694033fb6762478846c457382061f9f630.zip op-kernel-dev-b2532c694033fb6762478846c457382061f9f630.tar.gz | |
f2fs: rename dio_rwsem to i_gc_rwsem
RW semphore dio_rwsem in struct f2fs_inode_info is introduced to avoid
race between dio and data gc, but now, it is more wildly used to avoid
foreground operation vs data gc. So rename it to i_gc_rwsem to improve
its readability.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/gc.c')
| -rw-r--r-- | fs/f2fs/gc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index a7de8b34..94746d5 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -858,7 +858,7 @@ next_step: } if (!down_write_trylock( - &F2FS_I(inode)->dio_rwsem[WRITE])) { + &F2FS_I(inode)->i_gc_rwsem[WRITE])) { iput(inode); continue; } @@ -867,7 +867,7 @@ next_step: data_page = get_read_data_page(inode, start_bidx + ofs_in_node, REQ_RAHEAD, true); - up_write(&F2FS_I(inode)->dio_rwsem[WRITE]); + up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); if (IS_ERR(data_page)) { iput(inode); continue; @@ -885,11 +885,11 @@ next_step: bool locked = false; if (S_ISREG(inode->i_mode)) { - if (!down_write_trylock(&fi->dio_rwsem[READ])) + if (!down_write_trylock(&fi->i_gc_rwsem[READ])) continue; if (!down_write_trylock( - &fi->dio_rwsem[WRITE])) { - up_write(&fi->dio_rwsem[READ]); + &fi->i_gc_rwsem[WRITE])) { + up_write(&fi->i_gc_rwsem[READ]); continue; } locked = true; @@ -907,8 +907,8 @@ next_step: segno, off); if (locked) { - up_write(&fi->dio_rwsem[WRITE]); - up_write(&fi->dio_rwsem[READ]); + up_write(&fi->i_gc_rwsem[WRITE]); + up_write(&fi->i_gc_rwsem[READ]); } stat_inc_data_blk_count(sbi, 1, gc_type); |
