patch-2.4.15 linux/drivers/block/xd.c

• Lines: 21
• Date: Fri Nov 9 14:01:21 2001
• Orig file: v2.4.14/linux/drivers/block/xd.c
• Orig date: Mon Nov 5 15:55:29 2001

diff -u --recursive --new-file v2.4.14/linux/drivers/block/xd.c linux/drivers/block/xd.c
@@ -332,11 +332,6 @@
 			g.start = xd_struct[MINOR(inode->i_rdev)].start_sect;
 			return copy_to_user(geometry, &g, sizeof g) ? -EFAULT : 0;
 		}
-		case BLKGETSIZE:
-			if (!arg) return -EINVAL;
-			return put_user(xd_struct[MINOR(inode->i_rdev)].nr_sects,(unsigned long *) arg);
-		case BLKGETSIZE64:
-			return put_user((u64)xd_struct[MINOR(inode->i_rdev)].nr_sects << 9, (u64 *)arg);
 		case HDIO_SET_DMA:
 			if (!capable(CAP_SYS_ADMIN)) return -EACCES;
 			if (xdc_busy) return -EBUSY;
@@ -355,6 +350,8 @@
 				return -EACCES;
 			return xd_reread_partitions(inode->i_rdev);
 
+		case BLKGETSIZE:
+		case BLKGETSIZE64:
 		case BLKFLSBUF:
 		case BLKROSET:
 		case BLKROGET: