UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

f2fs: introduce f2fs_issue_discard() to clean up 

Change log from v1:
 o fix 32bit drops reported by Dan Carpenter

This patch adds f2fs_issue_discard() to clean up blkdev_issue_discard() flows.

Dan carpenter reported:
"block_t is a 32 bit type and sector_t is a 64 bit type.  The upper 32
bits of the sector_t are not used because the shift will wrap."

Bug-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Jaegeuk Kim 2013-11-12 16:55:17 +09:00
parent 7ac8c3b051
commit 3720887910
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/f2fs/segment.c
View File

@ -266,6 +266,14 @@ static void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno)
mutex_unlock(&dirty_i->seglist_lock); mutex_unlock(&dirty_i->seglist_lock);
} }
static void f2fs_issue_discard(struct f2fs_sb_info *sbi,
block_t blkstart, block_t blklen)
{
sector_t start = ((sector_t)blkstart) << sbi->log_sectors_per_block;
sector_t len = ((sector_t)blklen) << sbi->log_sectors_per_block;
blkdev_issue_discard(sbi->sb->s_bdev, start, len, GFP_NOFS, 0);
}
static void add_discard_addrs(struct f2fs_sb_info *sbi, static void add_discard_addrs(struct f2fs_sb_info *sbi,
unsigned int segno, struct seg_entry *se) unsigned int segno, struct seg_entry *se)
{ {
@ -354,22 +362,15 @@ void clear_prefree_segments(struct f2fs_sb_info *sbi)
if (!test_opt(sbi, DISCARD)) if (!test_opt(sbi, DISCARD))
continue; continue;
blkdev_issue_discard(sbi->sb->s_bdev, f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
START_BLOCK(sbi, start) << (end - start) << sbi->log_blocks_per_seg);
sbi->log_sectors_per_block,
(1 << (sbi->log_sectors_per_block +
sbi->log_blocks_per_seg)) * (end - start),
GFP_NOFS, 0);
} }
mutex_unlock(&dirty_i->seglist_lock); mutex_unlock(&dirty_i->seglist_lock);
/* send small discards */ /* send small discards */
list_for_each_safe(this, next, head) { list_for_each_safe(this, next, head) {
entry = list_entry(this, struct discard_entry, list); entry = list_entry(this, struct discard_entry, list);
blkdev_issue_discard(sbi->sb->s_bdev, f2fs_issue_discard(sbi, entry->blkaddr, entry->len);
entry->blkaddr << sbi->log_sectors_per_block,
(1 << sbi->log_sectors_per_block) * entry->len,
GFP_NOFS, 0);
list_del(&entry->list); list_del(&entry->list);
SM_I(sbi)->nr_discards -= entry->len; SM_I(sbi)->nr_discards -= entry->len;
kmem_cache_free(discard_entry_slab, entry); kmem_cache_free(discard_entry_slab, entry);