patch-2.4.0-test1 linux/fs/partitions/check.c

Next file: linux/fs/partitions/msdos.c
Previous file: linux/fs/nfsd/nfsfh.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre9/linux/fs/partitions/check.c linux/fs/partitions/check.c
@@ -75,11 +75,6 @@
 	NULL
 };
 
-#if defined CONFIG_BLK_DEV_LVM || defined CONFIG_BLK_DEV_LVM_MODULE
-#include <linux/lvm.h>
-void (*lvm_hd_name_ptr) (char *, int) = NULL;
-#endif
-
 /*
  * disk_name() is used by genhd.c and blkpg.c.
  * It formats the devicename of the indicated disk into
@@ -106,13 +101,6 @@
 	 * This requires special handling here.
 	 */
 	switch (hd->major) {
-#if defined CONFIG_BLK_DEV_LVM || defined CONFIG_BLK_DEV_LVM_MODULE
-		case LVM_BLK_MAJOR:
-			*buf = 0;
-			if ( lvm_hd_name_ptr != NULL)
-				(lvm_hd_name_ptr) ( buf, minor);
-			return buf;
-#endif
 		case IDE9_MAJOR:
 			unit += 2;
 		case IDE8_MAJOR:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)