nilfs2: replace barriers with explicit flush / FUA usage
Switch to the WRITE_FLUSH_FUA flag for log writes, remove the EOPNOTSUPP detection for barriers and stop setting the barrier flag for discards. tj: nilfs is now fixed to wait for discard completion. Updated this patch accordingly and dropped warning about it. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
parent
7cd33ad23e
commit
f8c131f5b6
|
@ -178,17 +178,9 @@ static int nilfs_sync_super(struct nilfs_sb_info *sbi, int flag)
|
||||||
|
|
||||||
retry:
|
retry:
|
||||||
set_buffer_dirty(nilfs->ns_sbh[0]);
|
set_buffer_dirty(nilfs->ns_sbh[0]);
|
||||||
|
|
||||||
if (nilfs_test_opt(sbi, BARRIER)) {
|
if (nilfs_test_opt(sbi, BARRIER)) {
|
||||||
err = __sync_dirty_buffer(nilfs->ns_sbh[0],
|
err = __sync_dirty_buffer(nilfs->ns_sbh[0],
|
||||||
WRITE_SYNC | WRITE_BARRIER);
|
WRITE_SYNC | WRITE_FLUSH_FUA);
|
||||||
if (err == -EOPNOTSUPP) {
|
|
||||||
nilfs_warning(sbi->s_super, __func__,
|
|
||||||
"barrier-based sync failed. "
|
|
||||||
"disabling barriers\n");
|
|
||||||
nilfs_clear_opt(sbi, BARRIER);
|
|
||||||
goto retry;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
err = sync_dirty_buffer(nilfs->ns_sbh[0]);
|
err = sync_dirty_buffer(nilfs->ns_sbh[0]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -774,9 +774,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
|
||||||
ret = blkdev_issue_discard(nilfs->ns_bdev,
|
ret = blkdev_issue_discard(nilfs->ns_bdev,
|
||||||
start * sects_per_block,
|
start * sects_per_block,
|
||||||
nblocks * sects_per_block,
|
nblocks * sects_per_block,
|
||||||
GFP_NOFS,
|
GFP_NOFS, BLKDEV_IFL_WAIT);
|
||||||
BLKDEV_IFL_WAIT |
|
|
||||||
BLKDEV_IFL_BARRIER);
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
nblocks = 0;
|
nblocks = 0;
|
||||||
|
@ -786,8 +784,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
|
||||||
ret = blkdev_issue_discard(nilfs->ns_bdev,
|
ret = blkdev_issue_discard(nilfs->ns_bdev,
|
||||||
start * sects_per_block,
|
start * sects_per_block,
|
||||||
nblocks * sects_per_block,
|
nblocks * sects_per_block,
|
||||||
GFP_NOFS,
|
GFP_NOFS, BLKDEV_IFL_WAIT);
|
||||||
BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue