[PATCH] cciss/cpqarray/md should use generic BLKGETSIZE

From: Christoph Hellwig (hch@sgi.com)
Date: Fri Dec 13 2002 - 17:52:32 EST


I did that already in 2.4.9/2.4.10 timeframe but it looks like a few
offenders started duplicating code again..

--- 1.27/drivers/block/cciss.c Wed Dec 4 01:00:00 2002
+++ edited/drivers/block/cciss.c Fri Dec 13 15:23:19 2002
@@ -468,16 +468,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:
--- 1.26/drivers/block/cpqarray.c Mon Oct 28 16:18:57 2002
+++ edited/drivers/block/cpqarray.c Fri Dec 13 15:24:07 2002
@@ -1287,12 +1287,6 @@
 
         case IDAGETDRVINFO:
                 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:
@@ -1360,6 +1354,8 @@
                 return(0);
         }
 
+ case BLKGETSIZE:
+ case BLKGETSIZE64:
         case BLKFLSBUF:
         case BLKBSZSET:
         case BLKBSZGET:
--- 1.33/drivers/md/md.c Tue Aug 6 16:42:18 2002
+++ edited/drivers/md/md.c Fri Dec 13 15:24:42 2002
@@ -2610,21 +2610,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:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Dec 15 2002 - 22:00:28 EST