diff options
author | Brian Behlendorf <[email protected]> | 2013-02-26 17:02:27 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2013-03-01 13:31:02 -0800 |
commit | 8128bd89fb487d91a3335605b009ac2b7d5aecd3 (patch) | |
tree | d8cb27ca13a2042718488519a491d7f93b7df8be /include/linux | |
parent | bd99a7584a3d93cffd6c57ef7b9c80ffd953d913 (diff) |
Fix hot spares
The issue with hot spares in ZoL is because it opens all leaf
vdevs exclusively (O_EXCL). On Linux, exclusive opens cause
subsequent exclusive opens to fail with EBUSY.
This could be resolved by not opening any of the devices
exclusively, which is what Illumos does, but the additional
protection offered by exclusive opens is desirable. It cleanly
prevents you from accidentally adding an in-use non-ZFS device
to your pool.
To fix this we very slightly relaxed the usage of O_EXCL in
the following ways.
1) Functions which open the device but only read had the
O_EXCL flag removed and were updated to use O_RDONLY.
2) A common holder was added to the vdev disk code. This
allow the ZFS code to internally open the device multiple
times but non-ZFS callers may not.
3) An exception was added to make_disks() for hot spare when
creating partition tables. For hot spare devices which
are already opened exclusively we skip creating the partition
table because this must already have been done when the disk
was originally added as a hot spare.
Additional minor changes include fixing check_in_use() to use
a partition instead of a slice suffix. And is_spare() was moved
above make_disks() to avoid adding a forward reference.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #250
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/blkdev_compat.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index 9d3e6f07c..47f569bbd 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -478,4 +478,13 @@ blk_queue_discard_granularity(struct request_queue *q, unsigned int dg) */ #define VDEV_SCHEDULER "noop" +/* + * A common holder for vdev_bdev_open() is used to relax the exclusive open + * semantics slightly. Internal vdev disk callers may pass VDEV_HOLDER to + * allow them to open the device multiple times. Other kernel callers and + * user space processes which don't pass this value will get EBUSY. This is + * currently required for the correct operation of hot spares. + */ +#define VDEV_HOLDER ((void *)0x2f5401de7) + #endif /* _ZFS_BLKDEV_H */ |