From: Christoph Hellwig <hch@sgi.com>
To: marcelo@conectiva.com.br
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] cciss/cpqarray/md should use generic BLKGETSIZE
Date: Thu, 16 Jan 2003 16:40:28 -0500 [thread overview]
Message-ID: <20030116164028.A10049@sgi.com> (raw)
I did that already in 2.4.9/2.4.10 timeframe but it looks like a few
offenders started duplicating code again..
--- 1.28/drivers/block/cciss.c Thu Dec 12 17:14:12 2002
+++ edited/drivers/block/cciss.c Wed Jan 15 23:15:36 2003
@@ -505,16 +505,12 @@
return -EFAULT;
return 0;
}
- case BLKGETSIZE:
- put_user(hba[ctlr]->hd[MINOR(inode->i_rdev)].nr_sects, (unsigned long *)arg);
- return 0;
- case BLKGETSIZE64:
- put_user((u64)hba[ctlr]->hd[MINOR(inode->i_rdev)].nr_sects << 9, (u64*)arg);
- return 0;
case BLKRRPART:
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
return revalidate_logvol(inode->i_rdev, 1);
+ case BLKGETSIZE:
+ case BLKGETSIZE64:
case BLKFLSBUF:
case BLKBSZSET:
case BLKBSZGET:
===== drivers/block/cpqarray.c 1.27 vs edited =====
--- 1.27/drivers/block/cpqarray.c Tue Dec 17 00:26:25 2002
+++ edited/drivers/block/cpqarray.c Wed Jan 15 23:16:02 2003
@@ -1279,13 +1279,6 @@
ida_ioctl_t *io = (ida_ioctl_t*)arg;
return copy_to_user(&io->c.drv,&hba[ctlr]->drv[dsk],sizeof(drv_info_t));
}
- case BLKGETSIZE:
- if (!arg)
- return -EINVAL;
- return put_user(hba[ctlr]->hd[MINOR(inode->i_rdev)].nr_sects,
- (unsigned long *)arg);
- case BLKGETSIZE64:
- return put_user((u64)(hba[ctlr]->hd[MINOR(inode->i_rdev)].nr_sects) << 9, (u64*)arg);
case BLKRRPART:
return revalidate_logvol(inode->i_rdev, 1);
case IDAPASSTHRU:
@@ -1379,6 +1372,8 @@
return(0);
}
+ case BLKGETSIZE:
+ case BLKGETSIZE64:
case BLKFLSBUF:
case BLKBSZSET:
case BLKBSZGET:
===== drivers/md/md.c 1.37 vs edited =====
--- 1.37/drivers/md/md.c Fri Jan 3 00:45:34 2003
+++ edited/drivers/md/md.c Wed Jan 15 23:15:01 2003
@@ -2617,21 +2617,8 @@
goto done;
#endif
- case BLKGETSIZE: /* Return device size */
- if (!arg) {
- err = -EINVAL;
- MD_BUG();
- goto abort;
- }
- err = md_put_user(md_hd_struct[minor].nr_sects,
- (unsigned long *) arg);
- goto done;
-
- case BLKGETSIZE64: /* Return device size */
- err = md_put_user((u64)md_hd_struct[minor].nr_sects << 9,
- (u64 *) arg);
- goto done;
-
+ case BLKGETSIZE:
+ case BLKGETSIZE64:
case BLKRAGET:
case BLKRASET:
case BLKFLSBUF:
next reply other threads:[~2003-01-16 14:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-01-16 21:40 Christoph Hellwig [this message]
-- strict thread matches above, loose matches on Subject: below --
2002-12-13 22:52 [PATCH] cciss/cpqarray/md should use generic BLKGETSIZE Christoph Hellwig
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=20030116164028.A10049@sgi.com \
--to=hch@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@conectiva.com.br \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.