diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-17 15:19:37 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-17 15:19:37 -0500 |
| commit | 580bdf5650fff8f66468ce491f8308f1117b7074 (patch) | |
| tree | 3570ba1406f8cf492308d07cd88d3e53742a69f2 /fs/f2fs/segment.c | |
| parent | e60a42635b764b56ae23c5fd8d36aac27c30f0ae (diff) | |
| parent | a249708bc2aa1fe3ddf15dfac22bee519d15996b (diff) | |
| download | kernel_replicant_linux-580bdf5650fff8f66468ce491f8308f1117b7074.tar.gz kernel_replicant_linux-580bdf5650fff8f66468ce491f8308f1117b7074.tar.bz2 kernel_replicant_linux-580bdf5650fff8f66468ce491f8308f1117b7074.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'fs/f2fs/segment.c')
| -rw-r--r-- | fs/f2fs/segment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 0738f48293cc..0d8802453758 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -713,8 +713,8 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi, } sector = SECTOR_FROM_BLOCK(blkstart); - if (sector & (bdev_zone_size(bdev) - 1) || - nr_sects != bdev_zone_size(bdev)) { + if (sector & (bdev_zone_sectors(bdev) - 1) || + nr_sects != bdev_zone_sectors(bdev)) { f2fs_msg(sbi->sb, KERN_INFO, "(%d) %s: Unaligned discard attempted (block %x + %x)", devi, sbi->s_ndevs ? FDEV(devi).path: "", |