Commit 3dfae718 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] cpqarray update for 2.6

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

This patch fixes 2 minor issues that break our Array Configuration utility.
 my_io was changed to a pointer so the & had to removed when using it with
copy_to_user().

Sometime in 2.5 SG_MAX got changed to 31.  Maybe to copy cciss?  Now I'm
changing it back to 32 so our app can work.
parent cd053a94
...@@ -1193,7 +1193,7 @@ static int ida_ioctl(struct inode *inode, struct file *filep, unsigned int cmd, ...@@ -1193,7 +1193,7 @@ static int ida_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
if (error) if (error)
goto out_passthru; goto out_passthru;
error = -EFAULT; error = -EFAULT;
if (copy_to_user(io, &my_io, sizeof(*my_io))) if (copy_to_user(io, my_io, sizeof(*my_io)))
goto out_passthru; goto out_passthru;
error = 0; error = 0;
out_passthru: out_passthru:
......
...@@ -67,7 +67,7 @@ typedef struct { ...@@ -67,7 +67,7 @@ typedef struct {
__u8 reserved; __u8 reserved;
} rhdr_t; } rhdr_t;
#define SG_MAX 31 #define SG_MAX 32
typedef struct { typedef struct {
rhdr_t hdr; rhdr_t hdr;
sg_t sg[SG_MAX]; sg_t sg[SG_MAX];
......
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