From 87d6c9df0c2f0f1c82246252cf1b5bae78a88c0b Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Mon, 13 Oct 2008 15:20:06 -0400 Subject: [PATCH] --- yaml --- r: 115475 b: refs/heads/master c: 4c393e6e457fb41169dd110c1b96a138394c2d7b h: refs/heads/master i: 115473: cbee783b24b47a8721de1598a3b0c1f0c88366f4 115471: 64220a318c65406aa8dabff70b91cfe7bfdf8edb v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.h | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a272c4c0d60c..166e331c97d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a343914831a8e29d89af3b26495ab1136a9e3153 +refs/heads/master: 4c393e6e457fb41169dd110c1b96a138394c2d7b diff --git a/trunk/drivers/scsi/sd.h b/trunk/drivers/scsi/sd.h index a92b991d98ab..75638e7d3f66 100644 --- a/trunk/drivers/scsi/sd.h +++ b/trunk/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 */