From: mike.miller@hp.com
To: marcelo.tosatti@cyclades.com, axboe@suse.de
Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org
Subject: [patch 1/2] cciss: cleans up warnings in the 32/64 bit conversions
Date: Thu, 21 Oct 2004 16:17:18 -0500 [thread overview]
Message-ID: <20041021211718.GA10462@beardog.cca.cpqcorp.net> (raw)
Patch 1 of 2 for 20041021.
This patch cleans up some warnings in the 32-bit to 64-bit conversions.
Please consider this for inclusion. Built against 2.4.28-pre4.
Please apply in order.
cciss.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
Signed off by Mike Miller.
-------------------------------------------------------------------------------
diff -burNp lx2428-pre4.orig/drivers/block/cciss.c lx2428-pre4/drivers/block/cciss.c
--- lx2428-pre4.orig/drivers/block/cciss.c 2004-10-21 09:14:27.388939808 -0500
+++ lx2428-pre4/drivers/block/cciss.c 2004-10-21 09:27:05.810642184 -0500
@@ -532,10 +532,9 @@ register_ioctl32_conversion(unsigned int
extern int unregister_ioctl32_conversion(unsigned int cmd);
static int cciss_ioctl32_passthru(unsigned int fd, unsigned cmd, unsigned long arg, struct file *file);
-static int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg,
- struct file *file);
+static int cciss_ioctl32_big_passthru(unsigned int fd, unsigned cmd, unsigned long arg, struct file *file);
-typedef long (*handler_type) (unsigned int, unsigned int, unsigned long,
+typedef int (*handler_type) (unsigned int, unsigned int, unsigned long,
struct file *);
static struct ioctl32_map {
@@ -611,7 +610,7 @@ int cciss_ioctl32_passthru(unsigned int
err |= copy_from_user(&arg64.Request, &arg32->Request, sizeof(arg64.Request));
err |= copy_from_user(&arg64.error_info, &arg32->error_info, sizeof(arg64.error_info));
err |= get_user(arg64.buf_size, &arg32->buf_size);
- err |= get_user(arg64.buf, &arg32->buf);
+ err |= get_user((__u64) arg64.buf, &arg32->buf);
if (err)
return -EFAULT;
@@ -641,7 +640,7 @@ int cciss_ioctl32_big_passthru(unsigned
err |= copy_from_user(&arg64.error_info, &arg32->error_info, sizeof(arg64.error_info));
err |= get_user(arg64.buf_size, &arg32->buf_size);
err |= get_user(arg64.malloc_size, &arg32->malloc_size);
- err |= get_user(arg64.buf, &arg32->buf);
+ err |= get_user((__u64) arg64.buf, &arg32->buf);
if (err) return -EFAULT;
old_fs = get_fs();
set_fs(KERNEL_DS);
next reply other threads:[~2004-10-21 21:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-21 21:17 mike.miller [this message]
2004-10-22 0:00 ` [patch 1/2] cciss: cleans up warnings in the 32/64 bit conversions Maciej W. Rozycki
2004-10-22 18:30 ` mikem
2004-10-22 20:59 ` Maciej W. Rozycki
2004-10-24 15:54 ` James Bottomley
2004-10-26 19:45 ` mikem
2004-10-26 19:57 ` James Bottomley
2004-10-26 21:44 ` mikem
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=20041021211718.GA10462@beardog.cca.cpqcorp.net \
--to=mike.miller@hp.com \
--cc=axboe@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=marcelo.tosatti@cyclades.com \
--cc=mikem@beardog.cca.cpqcorp.net \
/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