Merge LVM update

diff --cc drivers/md/lvm.c
index 11311ada2f26710bcea268d8ba74ed3103ac4589,0c172b4221694e5474f88d9502374bee1eb5f717..d5ceb3f570d7764909fb7c5dfc02563986b42904
--- 1/drivers/md/lvm.c
--- 2/drivers/md/lvm.c
+++ b/drivers/md/lvm.c
@@@ -2000,16 -2030,17 +2003,16 @@@ static int lvm_do_lv_create(int minor, 
                        vg_ptr->lv[l] = NULL;
                        return -EINVAL;
                }
-       } /* if ( vg[VG_CHR(minor)]->lv[l]->lv_access & LV_SNAPSHOT) */
+       } /* if ( vg[VG_CHR(minor)]->lv[l]->u.lv_access & LV_SNAPSHOT) */
  
        lv_ptr = vg_ptr->lv[l];
-       lvm_gendisk.part[minor(lv_ptr->lv_dev)].start_sect = 0;
-       lvm_gendisk.part[minor(lv_ptr->lv_dev)].nr_sects = lv_ptr->lv_size;
-       lvm_size[minor(lv_ptr->lv_dev)] = lv_ptr->lv_size >> 1;
-       vg_lv_map[minor(lv_ptr->lv_dev)].vg_number = vg_ptr->vg_number;
-       vg_lv_map[minor(lv_ptr->lv_dev)].lv_number = lv_ptr->lv_number;
+       lvm_gendisk.part[minor(lv_ptr->u.lv_dev)].start_sect = 0;
+       lvm_gendisk.part[minor(lv_ptr->u.lv_dev)].nr_sects = lv_ptr->u.lv_size;
+       lvm_size[minor(lv_ptr->u.lv_dev)] = lv_ptr->u.lv_size >> 1;
+       vg_lv_map[minor(lv_ptr->u.lv_dev)].vg_number = vg_ptr->vg_number;
+       vg_lv_map[minor(lv_ptr->u.lv_dev)].lv_number = lv_ptr->u.lv_number;
 -      LVM_CORRECT_READ_AHEAD(lv_ptr->u.lv_read_ahead);
        vg_ptr->lv_cur++;
-       lv_ptr->lv_status = lv_status_save;
+       lv_ptr->u.lv_status = lv_status_save;
  
        __update_hardsectsize(lv_ptr);