patch-2.4.15 linux/include/linux/blkdev.h

• Lines: 21
• Date: Thu Nov 22 11:47:08 2001
• Orig file: v2.4.14/linux/include/linux/blkdev.h
• Orig date: Mon Nov 5 15:55:35 2001

diff -u --recursive --new-file v2.4.14/linux/include/linux/blkdev.h linux/include/linux/blkdev.h
@@ -195,11 +195,15 @@
 
 static inline int get_hardsect_size(kdev_t dev)
 {
-	extern int *hardsect_size[];
-	if (hardsect_size[MAJOR(dev)] != NULL)
-		return hardsect_size[MAJOR(dev)][MINOR(dev)];
-	else
-		return 512;
+	int retval = 512;
+	int major = MAJOR(dev);
+
+	if (hardsect_size[major]) {
+		int minor = MINOR(dev);
+		if (hardsect_size[major][minor])
+			retval = hardsect_size[major][minor];
+	}
+	return retval;
 }
 
 #define blk_finished_io(nsects)	do { } while (0)