diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-03-04 20:46:17 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2016-03-18 11:42:53 -0400 |
| commit | f99d4fbdae6765d0bb4ed5441f6fa1f036122d59 (patch) | |
| tree | b2192caa11508d5107d2eea3be55c0ec68118e6c /fs/xfs | |
| parent | 368248eeb14d08823f1b53de83debd5fd6c108d2 (diff) | |
| download | linux-f99d4fbdae6765d0bb4ed5441f6fa1f036122d59.tar.bz2 | |
nfsd: add SCSI layout support
This is a simple extension to the block layout driver to use SCSI
persistent reservations for access control and fencing, as well as
SCSI VPD pages for device identification.
For this we need to pass the nfs4_client to the proc_getdeviceinfo method
to generate the reservation key, and add a new fence_client method
to allow for fence actions in the layout driver.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/Makefile | 1 | ||||
| -rw-r--r-- | fs/xfs/xfs_pnfs.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index d68b62a76592..3542d94fddce 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -122,3 +122,4 @@ xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o xfs-$(CONFIG_NFSD_BLOCKLAYOUT) += xfs_pnfs.o +xfs-$(CONFIG_NFSD_SCSILAYOUT) += xfs_pnfs.o diff --git a/fs/xfs/xfs_pnfs.h b/fs/xfs/xfs_pnfs.h index d85529ca299e..93f74853961b 100644 --- a/fs/xfs/xfs_pnfs.h +++ b/fs/xfs/xfs_pnfs.h @@ -1,7 +1,7 @@ #ifndef _XFS_PNFS_H #define _XFS_PNFS_H 1 -#ifdef CONFIG_NFSD_BLOCKLAYOUT +#if defined(CONFIG_NFSD_BLOCKLAYOUT) || defined(CONFIG_NFSD_SCSILAYOUT) int xfs_fs_get_uuid(struct super_block *sb, u8 *buf, u32 *len, u64 *offset); int xfs_fs_map_blocks(struct inode *inode, loff_t offset, u64 length, struct iomap *iomap, bool write, u32 *device_generation); |