Commit 5a1b759d authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] cciss build fix

From: <mikem@beardog.cca.cpqcorp.net>

This patch fixes the linux/include/cciss_ioctl.h file.  When support for the
cciss big ioctl was added the stucture in the header was put in the wrong
place.  If an application includes the file it will fail to compile.
parent 2acf06fa
......@@ -35,17 +35,6 @@ typedef __u32 DriverVer_type;
#define MAX_KMALLOC_SIZE 128000
typedef struct _BIG_IOCTL_Command_struct {
LUNAddr_struct LUN_info;
RequestBlock_struct Request;
ErrorInfo_struct error_info;
DWORD malloc_size; /* < MAX_KMALLOC_SIZE in cciss.c */
DWORD buf_size; /* size in bytes of the buf */
/* < malloc_size * MAXSGENTRIES */
BYTE *buf;
} BIG_IOCTL_Command_struct;
#ifndef CCISS_CMD_H
// This defines are duplicated in cciss_cmd.h in the driver directory
......@@ -181,6 +170,16 @@ typedef struct _IOCTL_Command_struct {
BYTE *buf;
} IOCTL_Command_struct;
typedef struct _BIG_IOCTL_Command_struct {
LUNAddr_struct LUN_info;
RequestBlock_struct Request;
ErrorInfo_struct error_info;
DWORD malloc_size; /* < MAX_KMALLOC_SIZE in cciss.c */
DWORD buf_size; /* size in bytes of the buf */
/* < malloc_size * MAXSGENTRIES */
BYTE *buf;
} BIG_IOCTL_Command_struct;
typedef struct _LogvolInfo_struct{
__u32 LunID;
int num_opens; /* number of opens on the logical volume */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment