diff -urN -X /home/andrea/archive/kernel/dontdiff/dontdiff 2.4.0-test13-pre4/drivers/md/Config.in 2.4.0-test13-pre4-lvm/drivers/md/Config.in --- 2.4.0-test13-pre4/drivers/md/Config.in Thu Nov 16 15:37:28 2000 +++ 2.4.0-test13-pre4-lvm/drivers/md/Config.in Fri Dec 22 16:14:27 2000 @@ -17,6 +17,6 @@ fi dep_tristate ' Logical volume manager (LVM) support' CONFIG_BLK_DEV_LVM $CONFIG_MD -dep_mbool ' LVM information in proc filesystem' CONFIG_LVM_PROC_FS $CONFIG_BLK_DEV_LVM +dep_mbool ' LVM information in proc filesystem' CONFIG_LVM_PROC_FS $CONFIG_BLK_DEV_LVM $CONFIG_PROC_FS endmenu diff -urN -X /home/andrea/archive/kernel/dontdiff/dontdiff 2.4.0-test13-pre4/drivers/md/lvm.c 2.4.0-test13-pre4-lvm/drivers/md/lvm.c --- 2.4.0-test13-pre4/drivers/md/lvm.c Fri Dec 22 15:32:55 2000 +++ 2.4.0-test13-pre4-lvm/drivers/md/lvm.c Fri Dec 22 16:17:12 2000 @@ -143,8 +143,12 @@ */ +#include + static char *lvm_version = "LVM version 0.9 by Heinz Mauelshagen (13/11/2000)\n"; +#ifdef CONFIG_LVM_PROC_FS static char *lvm_short_version = "version 0.9 (13/11/2000)"; +#endif #define MAJOR_NR LVM_BLK_MAJOR #define DEVICE_OFF(device) @@ -152,7 +156,6 @@ /* lvm_do_lv_create calls fsync_dev_lockfs()/unlockfs() */ /* #define LVM_VFS_ENHANCEMENT */ -#include #include #ifdef MODVERSIONS @@ -224,7 +227,7 @@ static int lvm_chr_ioctl(struct inode *, struct file *, uint, ulong); -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS int lvm_proc_read_vg_info(char *, char **, off_t, int, int *, void *); int lvm_proc_read_lv_info(char *, char **, off_t, int, int *, void *); int lvm_proc_read_pv_info(char *, char **, off_t, int, int *, void *); @@ -347,7 +350,7 @@ static spinlock_t lvm_lock = SPIN_LOCK_UNLOCKED; static spinlock_t lvm_snapshot_lock = SPIN_LOCK_UNLOCKED; -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS static struct proc_dir_entry *lvm_proc_dir = NULL; static struct proc_dir_entry *lvm_proc_vg_subdir = NULL; struct proc_dir_entry *pde = NULL; @@ -433,7 +436,7 @@ &lvm_chr_fops, NULL); #endif -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_proc_dir = create_proc_entry (LVM_DIR, S_IFDIR, &proc_root); if (lvm_proc_dir != NULL) { lvm_proc_vg_subdir = create_proc_entry (LVM_VG_SUBDIR, S_IFDIR, lvm_proc_dir); @@ -521,7 +524,7 @@ blksize_size[MAJOR_NR] = NULL; hardsect_size[MAJOR_NR] = NULL; -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS remove_proc_entry(LVM_GLOBAL, lvm_proc_dir); remove_proc_entry(LVM_VG_SUBDIR, lvm_proc_dir); remove_proc_entry(LVM_DIR, &proc_root); @@ -1263,7 +1266,7 @@ } -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS /* * Support functions /proc-Filesystem */ @@ -1452,8 +1455,6 @@ else return count; } /* lvm_proc_get_global_info() */ -#endif /* #if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS */ - /* * provide VG information @@ -1530,7 +1531,7 @@ return sz; } - +#endif /* CONFIG_LVM_PROC_FS */ /* * block device support function for /usr/src/linux/drivers/block/ll_rw_blk.c @@ -1989,7 +1990,7 @@ &lvm_chr_fops, NULL); #endif -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_do_create_proc_entry_of_vg ( vg_ptr); #endif @@ -2021,7 +2022,9 @@ for (p = 0; p < vg_ptr->pv_max; p++) { if ( ( pv_ptr = vg_ptr->pv[p]) == NULL) { ret = lvm_do_pv_create(arg, vg_ptr, p); +#ifdef CONFIG_LVM_PROC_FS lvm_do_create_proc_entry_of_pv ( vg_ptr, pv_ptr); +#endif if ( ret != 0) return ret; /* We don't need the PE list @@ -2091,7 +2094,7 @@ if (copy_from_user(vg_name, arg, sizeof(vg_name)) != 0) return -EFAULT; -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_do_remove_proc_entry_of_vg ( vg_ptr); #endif @@ -2115,7 +2118,7 @@ strncpy(pv_ptr->vg_name, vg_name, NAME_LEN); } -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_do_create_proc_entry_of_vg ( vg_ptr); #endif @@ -2179,7 +2182,7 @@ devfs_unregister (vg_devfs_handle[vg_ptr->vg_number]); #endif -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_do_remove_proc_entry_of_vg ( vg_ptr); #endif @@ -2237,7 +2240,7 @@ static int lvm_do_pv_remove(vg_t *vg_ptr, ulong p) { pv_t *pv_ptr = vg_ptr->pv[p]; -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_do_remove_proc_entry_of_pv ( vg_ptr, pv_ptr); #endif vg_ptr->pe_total -= @@ -2442,7 +2445,7 @@ } #endif -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_do_create_proc_entry_of_lv ( vg_ptr, lv_ptr); #endif @@ -2564,7 +2567,7 @@ devfs_unregister(lv_devfs_handle[lv_ptr->lv_number]); #endif -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_do_remove_proc_entry_of_lv ( vg_ptr, lv_ptr); #endif @@ -2914,13 +2917,13 @@ if ( (lv_ptr = vg_ptr->lv[l]) == NULL) continue; if (lv_ptr->lv_dev == lv->lv_dev) { -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_do_remove_proc_entry_of_lv ( vg_ptr, lv_ptr); #endif strncpy(lv_ptr->lv_name, lv_req->lv_name, NAME_LEN); -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS +#ifdef CONFIG_LVM_PROC_FS lvm_do_create_proc_entry_of_lv ( vg_ptr, lv_ptr); #endif break; @@ -3002,7 +3005,7 @@ } /* lvm_do_pv_status() */ - +#ifdef CONFIG_LVM_PROC_FS /* * create a /proc entry for a logical volume */ @@ -3074,7 +3077,6 @@ /* * create a /proc entry for a volume group */ -#if defined CONFIG_LVM_PROC_FS && defined CONFIG_PROC_FS void lvm_do_create_proc_entry_of_vg ( vg_t *vg_ptr) { int l, p; pv_t *pv_ptr; @@ -3133,8 +3135,7 @@ remove_proc_entry(vg_ptr->vg_name, lvm_proc_vg_subdir); } } -#endif - +#endif /* CONFIG_LVM_PROC_FS */ /* * support function initialize gendisk variables