diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-10-13 15:20:06 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-10-15 08:41:28 -0400 |
| commit | 4c393e6e457fb41169dd110c1b96a138394c2d7b (patch) | |
| tree | 88cef9416def18b891eeef6d604b50b182962eb4 /drivers/scsi | |
| parent | a343914831a8e29d89af3b26495ab1136a9e3153 (diff) | |
| download | kernel_samsung_crespo-4c393e6e457fb41169dd110c1b96a138394c2d7b.zip kernel_samsung_crespo-4c393e6e457fb41169dd110c1b96a138394c2d7b.tar.gz kernel_samsung_crespo-4c393e6e457fb41169dd110c1b96a138394c2d7b.tar.bz2 | |
[SCSI] sd: fix compile failure with CONFIG_BLK_DEV_INTEGRITY=n
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/sd.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index a92b991..75638e7 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -97,7 +97,7 @@ struct sd_dif_tuple { __be32 ref_tag; /* Target LBA or indirect LBA */ }; -#if defined(CONFIG_BLK_DEV_INTEGRITY) +#ifdef CONFIG_BLK_DEV_INTEGRITY extern void sd_dif_op(struct scsi_cmnd *, unsigned int, unsigned int, unsigned int); extern void sd_dif_config_host(struct scsi_disk *); @@ -106,10 +106,19 @@ extern void sd_dif_complete(struct scsi_cmnd *, unsigned int); #else /* CONFIG_BLK_DEV_INTEGRITY */ -#define sd_dif_op(a, b, c) do { } while (0) -#define sd_dif_config_host(a) do { } while (0) -#define sd_dif_prepare(a, b, c) (0) -#define sd_dif_complete(a, b) (0) +static inline void sd_dif_op(struct scsi_cmnd *cmd, unsigned int a, unsigned int b, unsigned int c) +{ +} +static inline void sd_dif_config_host(struct scsi_disk *disk) +{ +} +static inline int sd_dif_prepare(struct request *rq, sector_t s, unsigned int a) +{ + return 0; +} +static inline void sd_dif_complete(struct scsi_cmnd *cmd, unsigned int a) +{ +} #endif /* CONFIG_BLK_DEV_INTEGRITY */ |