2009-09-24 13:37:29

by Alexander Beregalov

Subject: [PATCH next] cciss: fix build when !PROC_FS

Fix these build errors when CONFIG_PROC_FS is not set:
drivers/block/cciss.c: In function 'cciss_show_raid_level':
drivers/block/cciss.c:623: error: 'RAID_UNKNOWN' undeclared (first use in this function)
drivers/block/cciss.c:626: error: 'raid_label' undeclared (first use in this function)
drivers/block/cciss.c: In function 'cciss_geometry_inquiry':
drivers/block/cciss.c:2696: error: 'RAID_UNKNOWN' undeclared (first use in this function)

Signed-off-by: Alexander Beregalov <[email protected]>
---
drivers/block/cciss.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 4d879b7..78852b1 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -256,6 +256,11 @@ static inline void removeQ(CommandList_struct *c)

#include "cciss_scsi.c" /* For SCSI tape support */

+static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG",
+ "UNKNOWN"
+};
+#define RAID_UNKNOWN (sizeof(raid_label) / sizeof(raid_label[0])-1)
+
#ifdef CONFIG_PROC_FS

/*
@@ -264,10 +269,6 @@ static inline void removeQ(CommandList_struct *c)
#define ENG_GIG 1000000000
#define ENG_GIG_FACTOR (ENG_GIG/512)
#define ENGAGE_SCSI "engage scsi"
-static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG",
- "UNKNOWN"
-};
-#define RAID_UNKNOWN (sizeof(raid_label) / sizeof(raid_label[0])-1)

static struct proc_dir_entry *proc_cciss;

--
1.6.5.rc1

2009-09-24 14:14:58

by Jens Axboe

Subject: Re: [PATCH next] cciss: fix build when !PROC_FS

On Thu, Sep 24 2009, Alexander Beregalov wrote:
> Fix these build errors when CONFIG_PROC_FS is not set:
> drivers/block/cciss.c: In function 'cciss_show_raid_level':
> drivers/block/cciss.c:623: error: 'RAID_UNKNOWN' undeclared (first use in this function)
> drivers/block/cciss.c:626: error: 'raid_label' undeclared (first use in this function)
> drivers/block/cciss.c: In function 'cciss_geometry_inquiry':
> drivers/block/cciss.c:2696: error: 'RAID_UNKNOWN' undeclared (first use in this function)

Thanks, applied.

--
Jens Axboe