Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[~andy/linux] / drivers / target / target_core_file.h

diff --git a/drivers/target/target_core_file.h b/drivers/target/target_core_file.h
index d7772c167685fecc89caf699884198b9a9d9f999..182cbb2950395efa43630364ba3d3f78aca3f925 100644 (file)
--- a/drivers/target/target_core_file.h
+++ b/drivers/target/target_core_file.h
@@ -4,6 +4,7 @@
 #define FD_VERSION             "4.0"
 
 #define FD_MAX_DEV_NAME                256
+#define FD_MAX_DEV_PROT_NAME   FD_MAX_DEV_NAME + 16
 #define FD_DEVICE_QUEUE_DEPTH  32
 #define FD_MAX_DEVICE_QUEUE_DEPTH 128
 #define FD_BLOCKSIZE           512
@@ -18,6 +19,13 @@
 #define FBDF_HAS_PATH          0x01
 #define FBDF_HAS_SIZE          0x02
 #define FDBD_HAS_BUFFERED_IO_WCE 0x04
+#define FDBD_FORMAT_UNIT_SIZE  2048
+
+struct fd_prot {
+       unsigned char   *prot_buf;
+       struct scatterlist *prot_sg;
+       u32 prot_sg_nents;
+};
 
 struct fd_dev {
        struct se_device dev;
@@ -32,6 +40,7 @@ struct fd_dev {
        u32             fd_block_size;
        unsigned long long fd_dev_size;
        struct file     *fd_file;
+       struct file     *fd_prot_file;
        /* FILEIO HBA device is connected to */
        struct fd_host *fd_host;
 } ____cacheline_aligned;