Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 2.6.37 compat, WRITE_FLUSH_FUA 

The WRITE_FLUSH, WRITE_FUA, and WRITE_FLUSH_FUA flags have been
introduced as a replacement for WRITE_BARRIER.  This was done
to allow richer semantics to be expressed to the block layer.
It is the block layers responsibility to choose the correct way
to implement these semantics.

This change simply updates the bio's to use the new kernel API
which should be absolutely safe.  However, since ZFS depends
entirely on this working as designed for correctness we do
want to be careful.

Closes #281
This commit is contained in:
Brian Behlendorf 2011-06-16 20:20:22 +02:00
parent db97f88646
commit 96801d2906
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/blkdev_compat.h
View File

@ -338,6 +338,20 @@ bio_set_flags_failfast(struct block_device *bdev, int *flags)
# define vdev_bdev_block_size(bdev) bdev_hardsect_size(bdev) # define vdev_bdev_block_size(bdev) bdev_hardsect_size(bdev)
#endif #endif
/*
* 2.6.37 API change
* The WRITE_FLUSH, WRITE_FUA, and WRITE_FLUSH_FUA flags have been
* introduced as a replacement for WRITE_BARRIER. This was done to
* allow richer semantics to be expressed to the block layer. It is
* the block layers responsibility to choose the correct way to
* implement these semantics.
*/
#ifdef WRITE_FLUSH_FUA
# define VDEV_WRITE_FLUSH_FUA WRITE_FLUSH_FUA
#else
# define VDEV_WRITE_FLUSH_FUA WRITE_BARRIER
#endif
/* /*
* Default Linux IO Scheduler, * Default Linux IO Scheduler,
* Setting the scheduler to noop will allow the Linux IO scheduler to * Setting the scheduler to noop will allow the Linux IO scheduler to

2
module/zfs/vdev_disk.c
View File

@ -559,7 +559,7 @@ vdev_disk_io_flush(struct block_device *bdev, zio_t *zio)
bio->bi_private = zio; bio->bi_private = zio;
bio->bi_bdev = bdev; bio->bi_bdev = bdev;
zio->io_delay = jiffies_64; zio->io_delay = jiffies_64;
submit_bio(WRITE_BARRIER, bio); submit_bio(VDEV_WRITE_FLUSH_FUA, bio);
return 0; return 0;
} }