From: "Michael S. Tsirkin" <mst@redhat.com>
To: James Bottomley <James.Bottomley@HansenPartnership.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
Boaz Harrosh <bharrosh@panasas.com>,
Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCHv2 2/4] scsi: make scsi/scsi.h headers_check clean
Date: Tue, 29 Sep 2009 12:34:19 +0200 [thread overview]
Message-ID: <20090929103419.GC11183@redhat.com> (raw)
In-Reply-To: <cover.1254220284.git.mst@redhat.com>
place extern declarations in scsi/scsi.h within ifdef __KERNEL__
so that make headers_install strips them out.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/scsi/scsi.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index dfcfaab..418465a 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -150,6 +150,7 @@ struct scsi_varlen_cdb_hdr {
/* service specific data follows */
};
+#ifdef __KERNEL__
static inline unsigned
scsi_varlen_cdb_length(const void *hdr)
{
@@ -165,6 +166,7 @@ scsi_command_size(const unsigned char *cmnd)
return (cmnd[0] == VARIABLE_LENGTH_CMD) ?
scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
}
+#endif
/*
* SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
@@ -281,8 +283,10 @@ enum scsi_protocol {
SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
};
+#ifdef __KERNEL__
/* Returns a human-readable name for the device */
extern const char * scsi_device_type(unsigned type);
+#endif
/*
* standard mode-select header prepended to all mode-select commands
--
1.6.5.rc2
next prev parent reply other threads:[~2009-09-29 10:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1254220284.git.mst@redhat.com>
2009-09-29 10:34 ` [PATCHv2 1/4] scsi: consistent use of __u8 in scsi/scsi.h Michael S. Tsirkin
2009-09-29 10:34 ` Michael S. Tsirkin [this message]
2009-09-29 10:34 ` [PATCHv2 3/4] scsi: export scsi_ioctl.h and sg.h headers Michael S. Tsirkin
2009-09-29 10:34 ` [PATCHv2 4/4] scsi: export scsi_tgt_if.h Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090929103419.GC11183@redhat.com \
--to=mst@redhat.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=bharrosh@panasas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.