From 530dedd89669b22903417e6c77f829fbeae4f094 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 13 Feb 2007 23:21:52 +0900 Subject: [PATCH] --- yaml --- r: 49103 b: refs/heads/master c: 930e99bd1320d78c7d8866595e81b8fc7dc8739b h: refs/heads/master i: 49101: f5b10159217819e218e47c5214dd8a9374781e04 49099: 5fdb606b37f2eda02faadd6bc7fe9383722ab1a5 49095: 355a469eaf2ca3f1b39f1756ea404ca6488efe1d 49087: cf8ca3fe36539ae0b06b2669f68e4b4b2ae47d35 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_tgt_if.c | 8 ++++++++ trunk/include/scsi/scsi_tgt_if.h | 3 --- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f3fe04ec90fd..c0d0a6d03596 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f3334edae93f8b664417f4140d4d9dc9a003fe4 +refs/heads/master: 930e99bd1320d78c7d8866595e81b8fc7dc8739b diff --git a/trunk/drivers/scsi/scsi_tgt_if.c b/trunk/drivers/scsi/scsi_tgt_if.c index f2344ab8deff..0e08817fdecf 100644 --- a/trunk/drivers/scsi/scsi_tgt_if.c +++ b/trunk/drivers/scsi/scsi_tgt_if.c @@ -33,6 +33,14 @@ #include "scsi_tgt_priv.h" +#if TGT_RING_SIZE < PAGE_SIZE +# define TGT_RING_SIZE PAGE_SIZE +#endif + +#define TGT_RING_PAGES (TGT_RING_SIZE >> PAGE_SHIFT) +#define TGT_EVENT_PER_PAGE (PAGE_SIZE / sizeof(struct tgt_event)) +#define TGT_MAX_EVENTS (TGT_EVENT_PER_PAGE * TGT_RING_PAGES) + struct tgt_ring { u32 tr_idx; unsigned long tr_pages[TGT_RING_PAGES]; diff --git a/trunk/include/scsi/scsi_tgt_if.h b/trunk/include/scsi/scsi_tgt_if.h index 46d5e70d7215..07d6e77ae895 100644 --- a/trunk/include/scsi/scsi_tgt_if.h +++ b/trunk/include/scsi/scsi_tgt_if.h @@ -83,8 +83,5 @@ struct tgt_event { } __attribute__ ((aligned (sizeof(uint64_t)))); #define TGT_RING_SIZE (1UL << 16) -#define TGT_RING_PAGES (TGT_RING_SIZE >> PAGE_SHIFT) -#define TGT_EVENT_PER_PAGE (PAGE_SIZE / sizeof(struct tgt_event)) -#define TGT_MAX_EVENTS (TGT_EVENT_PER_PAGE * TGT_RING_PAGES) #endif