linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: linux-scsi <linux-scsi@vger.kernel.org>,
	James Bottomley <James.Bottomley@suse.de>
Cc: Christoph Hellwig <hch@lst.de>,
	Mike Christie <michaelc@cs.wisc.edu>,
	Hannes Reinecke <hare@suse.de>,
	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>,
	Boaz Harrosh <bharrosh@panasas.com>,
	Nicholas Bellinger <nab@linux-iscsi.org>
Subject: [PATCH-v2 02/14] iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h
Date: Tue, 22 Mar 2011 20:06:33 -0700	[thread overview]
Message-ID: <1300849605-12651-3-git-send-email-nab@linux-iscsi.org> (raw)
In-Reply-To: <1300849605-12651-1-git-send-email-nab@linux-iscsi.org>

From: Nicholas Bellinger <nab@linux-iscsi.org>

This patch moves the iscsi_sna_lt() and iscsi_sna_lte(), along with
iscsi_sna_gt() and iscsi_sna_gte() from iscsi_target_mod into
static inlines inside of include/scsi/iscsi_proto.h

Reported-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
---
 drivers/scsi/libiscsi.c    |   16 ----------------
 include/scsi/iscsi_proto.h |   29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 9c3cb4e..3461a03 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -84,22 +84,6 @@ MODULE_PARM_DESC(debug_libiscsi_eh,
 					     __func__, ##arg);		\
 	} while (0);
 
-/* Serial Number Arithmetic, 32 bits, less than, RFC1982 */
-#define SNA32_CHECK 2147483648UL
-
-static int iscsi_sna_lt(u32 n1, u32 n2)
-{
-	return n1 != n2 && ((n1 < n2 && (n2 - n1 < SNA32_CHECK)) ||
-			    (n1 > n2 && (n2 - n1 < SNA32_CHECK)));
-}
-
-/* Serial Number Arithmetic, 32 bits, less than, RFC1982 */
-static int iscsi_sna_lte(u32 n1, u32 n2)
-{
-	return n1 == n2 || ((n1 < n2 && (n2 - n1 < SNA32_CHECK)) ||
-			    (n1 > n2 && (n2 - n1 < SNA32_CHECK)));
-}
-
 inline void iscsi_conn_queue_work(struct iscsi_conn *conn)
 {
 	struct Scsi_Host *shost = conn->session->host;
diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h
index a9c9058..626b0344 100644
--- a/include/scsi/iscsi_proto.h
+++ b/include/scsi/iscsi_proto.h
@@ -33,6 +33,35 @@
 #define ISCSI_PAD_LEN		4
 
 /*
+ * Serial Number Arithmetic, 32 bits, RFC1982
+ */
+#define SNA32_CHECK 2147483648UL
+
+static inline int iscsi_sna_lt(u32 n1, u32 n2)
+{
+	return n1 != n2 && ((n1 < n2 && (n2 - n1 < SNA32_CHECK)) ||
+			(n1 > n2 && (n2 - n1 < SNA32_CHECK)));
+}
+
+static inline int iscsi_sna_lte(u32 n1, u32 n2)
+{
+	return n1 == n2 || ((n1 < n2 && (n2 - n1 < SNA32_CHECK)) ||
+			(n1 > n2 && (n2 - n1 < SNA32_CHECK)));
+}
+
+static inline int iscsi_sna_gt(u32 n1, u32 n2)
+{
+	return n1 != n2 && (((n1 < n2) && ((n2 - n1) > SNA32_CHECK)) ||
+			((n1 > n2) && ((n1 - n2) < SNA32_CHECK)));
+}
+
+static inline int iscsi_sna_gte(u32 n1, u32 n2)
+{
+	return n1 == n2 || (((n1 < n2) && ((n2 - n1) > SNA32_CHECK)) ||
+			((n1 > n2) && ((n1 - n2) < SNA32_CHECK)));
+}
+
+/*
  * useful common(control and data pathes) macro
  */
 #define ntoh24(p) (((p)[0] << 16) | ((p)[1] << 8) | ((p)[2]))
-- 
1.7.4.1


  parent reply	other threads:[~2011-03-23  3:06 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-23  3:06 [PATCH-v2 00/14] iscsi-target: iSCSI target v4.1.0-rc1 series initial merge Nicholas A. Bellinger
2011-03-23  3:06 ` Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 01/14] iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi Nicholas A. Bellinger
2011-03-23  3:06 ` Nicholas A. Bellinger [this message]
2011-03-23  3:06 ` [PATCH-v2 03/14] target: Convert REPORT_LUNs to use int_to_scsilun Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 04/14] iscsi-target: Add iSCSI fabric support for target v4 Nicholas A. Bellinger
2011-04-07  7:34   ` Mike Christie
2011-05-09 16:22     ` Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 05/14] iscsi-target: Add TCM v4 compatiable ConfigFS control plane Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 06/14] iscsi-target: Add configfs fabric dependent statistics Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 07/14] iscsi-target: Add TPG and Device logic Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 08/14] iscsi-target: Add iSCSI Login Negotiation and Parameter logic Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 09/14] iscsi-target: Add CHAP Authentication support using libcrypto Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 10/14] iscsi-target: Add Sequence/PDU list + DataIN response logic Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 11/14] iscsi-target: Add iSCSI Error Recovery Hierarchy support Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 12/14] iscsi-target: Add support for task management operations Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 13/14] iscsi-target: Add misc utility and debug logic Nicholas A. Bellinger
2011-03-23  3:06 ` [PATCH-v2 14/14] iscsi-target: Add Makefile/Kconfig and update TCM top level Nicholas A. Bellinger
2011-03-23  8:54 ` [PATCH-v2 00/14] iscsi-target: iSCSI target v4.1.0-rc1 series initial merge FUJITA Tomonori
2011-03-23 10:22   ` Nicholas A. Bellinger
2011-03-23 11:07     ` FUJITA Tomonori
2011-03-23 21:37       ` Nicholas A. Bellinger
2011-03-23 22:46         ` FUJITA Tomonori
2011-03-23 23:28           ` Nicholas A. Bellinger
2011-03-24  1:29             ` FUJITA Tomonori
2011-03-24  6:59               ` Nicholas A. Bellinger
2011-03-25  0:18                 ` James Bottomley
2011-03-25 11:31                   ` Bart Van Assche
2011-03-25 15:06                     ` James Bottomley
2011-03-25 18:44                       ` Bart Van Assche
2011-03-25 19:34                         ` James Bottomley
2011-03-25 19:49                           ` Bart Van Assche
2011-03-25 19:54                             ` James Bottomley
2011-03-25 20:05                               ` Bart Van Assche
2011-03-25 21:14                   ` Nicholas A. Bellinger
2011-03-27 10:02                     ` FUJITA Tomonori
2011-03-28  8:30                       ` Nicholas A. Bellinger
2011-03-28  8:33                         ` FUJITA Tomonori
2011-03-27 10:02                 ` FUJITA Tomonori
2011-03-28  8:53                   ` Nicholas A. Bellinger

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=1300849605-12651-3-git-send-email-nab@linux-iscsi.org \
    --to=nab@linux-iscsi.org \
    --cc=James.Bottomley@suse.de \
    --cc=bharrosh@panasas.com \
    --cc=fujita.tomonori@lab.ntt.co.jp \
    --cc=hare@suse.de \
    --cc=hch@lst.de \
    --cc=linux-scsi@vger.kernel.org \
    --cc=michaelc@cs.wisc.edu \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).