luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SCSI] sd: fix compile failure with CONFIG_BLK_DEV_INTEGRITY=n

Browse Source 
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
James Bottomley 2008-10-13 15:20:06 -04:00
parent a343914831
commit 4c393e6e45
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/scsi/sd.h
View File

@ -97,7 +97,7 @@ struct sd_dif_tuple {
__be32 ref_tag; /* Target LBA or indirect LBA */ __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_op(struct scsi_cmnd *, unsigned int, unsigned int, unsigned int);
extern void sd_dif_config_host(struct scsi_disk *); 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 */ #else /* CONFIG_BLK_DEV_INTEGRITY */
#define sd_dif_op(a, b, c) do { } while (0) static inline void sd_dif_op(struct scsi_cmnd *cmd, unsigned int a, unsigned int b, unsigned int c)
#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_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 */ #endif /* CONFIG_BLK_DEV_INTEGRITY */