Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c

5 files changed, 199 insertions, 117 deletions

diff --git a/fs/partitions/acorn.c b/fs/partitions/acorn.c
index e3491328596b..3d3e16631472 100644
--- a/fs/partitions/acorn.c
+++ b/fs/partitions/acorn.c
@@ -25,6 +25,8 @@
 #define PARTITION_RISCIX_SCSI   2
 #define PARTITION_LINUX         9
 
+#if defined(CONFIG_ACORN_PARTITION_CUMANA) || \
+        defined(CONFIG_ACORN_PARTITION_ADFS)
 static struct adfs_discrecord *
 adfs_partition(struct parsed_partitions *state, char *name, char *data,
                unsigned long first_sector, int slot)
@@ -48,6 +50,7 @@ adfs_partition(struct parsed_partitions *state, char *name, char *data,
         put_partition(state, slot, first_sector, nr_sects);
         return dr;
 }
+#endif
 
 #ifdef CONFIG_ACORN_PARTITION_RISCIX
 
@@ -65,6 +68,8 @@ struct riscix_record {
         struct riscix_part part[8];
 };
 
+#if defined(CONFIG_ACORN_PARTITION_CUMANA) || \
+        defined(CONFIG_ACORN_PARTITION_ADFS)
 static int
 riscix_partition(struct parsed_partitions *state, struct block_device *bdev,
                 unsigned long first_sect, int slot, unsigned long nr_sects)
@@ -105,6 +110,7 @@ riscix_partition(struct parsed_partitions *state, struct block_device *bdev,
         return slot;
 }
 #endif
+#endif
 
 #define LINUX_NATIVE_MAGIC 0xdeafa1de
 #define LINUX_SWAP_MAGIC   0xdeafab1e
@@ -115,6 +121,8 @@ struct linux_part {
         __le32 nr_sects;
 };
 
+#if defined(CONFIG_ACORN_PARTITION_CUMANA) || \
+        defined(CONFIG_ACORN_PARTITION_ADFS)
 static int
 linux_partition(struct parsed_partitions *state, struct block_device *bdev,
                 unsigned long first_sect, int slot, unsigned long nr_sects)
@@ -146,6 +154,7 @@ linux_partition(struct parsed_partitions *state, struct block_device *bdev,
         put_dev_sector(sect);
         return slot;
 }
+#endif
 
 #ifdef CONFIG_ACORN_PARTITION_CUMANA
 int
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 9a3a058f3553..98e0b85a9bb2 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -397,7 +397,6 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len,
                 static struct attribute addpartattr = {
                         .name = "whole_disk",
                         .mode = S_IRUSR | S_IRGRP | S_IROTH,
-                        .owner = THIS_MODULE,
                 };
 
                 sysfs_create_file(&p->kobj, &addpartattr);
diff --git a/fs/partitions/ibm.c b/fs/partitions/ibm.c
index 9f7ad4244f63..1e064c4a4f86 100644
--- a/fs/partitions/ibm.c
+++ b/fs/partitions/ibm.c
@@ -45,7 +45,7 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
 {
         int blocksize, offset, size,res;
         loff_t i_size;
-        dasd_information_t *info;
+        dasd_information2_t *info;
         struct hd_geometry *geo;
         char type[5] = {0,};
         char name[7] = {0,};
@@ -64,14 +64,17 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
         if (i_size == 0)
                 goto out_exit;
 
-        if ((info = kmalloc(sizeof(dasd_information_t), GFP_KERNEL)) == NULL)
+        info = kmalloc(sizeof(dasd_information2_t), GFP_KERNEL);
+        if (info == NULL)
                 goto out_exit;
-        if ((geo = kmalloc(sizeof(struct hd_geometry), GFP_KERNEL)) == NULL)
+        geo = kmalloc(sizeof(struct hd_geometry), GFP_KERNEL);
+        if (geo == NULL)
                 goto out_nogeo;
-        if ((label = kmalloc(sizeof(union label_t), GFP_KERNEL)) == NULL)
+        label = kmalloc(sizeof(union label_t), GFP_KERNEL);
+        if (label == NULL)
                 goto out_nolab;
 
-        if (ioctl_by_bdev(bdev, BIODASDINFO, (unsigned long)info) != 0 ||
+        if (ioctl_by_bdev(bdev, BIODASDINFO2, (unsigned long)info) != 0 ||
             ioctl_by_bdev(bdev, HDIO_GETGEO, (unsigned long)geo) != 0)
                 goto out_freeall;
 
@@ -96,84 +99,108 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
         res = 1;
 
         /*
-         * Three different types: CMS1, VOL1 and LNX1/unlabeled
+         * Three different formats: LDL, CDL and unformated disk
+         *
+         * identified by info->format
+         *
+         * unformated disks we do not have to care about
          */
-        if (strncmp(type, "CMS1", 4) == 0) {
-                /*
-                 * VM style CMS1 labeled disk
-                 */
-                if (label->cms.disk_offset != 0) {
-                        printk("CMS1/%8s(MDSK):", name);
-                        /* disk is reserved minidisk */
-                        blocksize = label->cms.block_size;
-                        offset = label->cms.disk_offset;
-                        size = (label->cms.block_count - 1) * (blocksize >> 9);
+        if (info->format == DASD_FORMAT_LDL) {
+                if (strncmp(type, "CMS1", 4) == 0) {
+                        /*
+                         * VM style CMS1 labeled disk
+                         */
+                        if (label->cms.disk_offset != 0) {
+                                printk("CMS1/%8s(MDSK):", name);
+                                /* disk is reserved minidisk */
+                                blocksize = label->cms.block_size;
+                                offset = label->cms.disk_offset;
+                                size = (label->cms.block_count - 1)
+                                        * (blocksize >> 9);
+                        } else {
+                                printk("CMS1/%8s:", name);
+                                offset = (info->label_block + 1);
+                                size = i_size >> 9;
+                        }
                 } else {
-                        printk("CMS1/%8s:", name);
+                        /*
+                         * Old style LNX1 or unlabeled disk
+                         */
+                        if (strncmp(type, "LNX1", 4) == 0)
+                                printk ("LNX1/%8s:", name);
+                        else
+                                printk("(nonl)");
                         offset = (info->label_block + 1);
                         size = i_size >> 9;
                 }
                 put_partition(state, 1, offset*(blocksize >> 9),
-                                 size-offset*(blocksize >> 9));
-        } else if ((strncmp(type, "VOL1", 4) == 0) &&
-                (!info->FBA_layout) && (!strcmp(info->type, "ECKD"))) {
+                                      size-offset*(blocksize >> 9));
+        } else if (info->format == DASD_FORMAT_CDL) {
                 /*
-                 * New style VOL1 labeled disk
+                 * New style CDL formatted disk
                  */
                 unsigned int blk;
                 int counter;
 
-                printk("VOL1/%8s:", name);
-
-                /* get block number and read then go through format1 labels */
-                blk = cchhb2blk(&label->vol.vtoc, geo) + 1;
-                counter = 0;
-                while ((data = read_dev_sector(bdev, blk*(blocksize/512),
-                                               &sect)) != NULL) {
-                        struct vtoc_format1_label f1;
-
-                        memcpy(&f1, data, sizeof(struct vtoc_format1_label));
-                        put_dev_sector(sect);
-
-                        /* skip FMT4 / FMT5 / FMT7 labels */
-                        if (f1.DS1FMTID == _ascebc['4']
-                            || f1.DS1FMTID == _ascebc['5']
-                            || f1.DS1FMTID == _ascebc['7']) {
-                                blk++;
-                                continue;
-                        }
-
-                        /* only FMT1 valid at this point */
-                        if (f1.DS1FMTID != _ascebc['1'])
-                                break;
-
-                        /* OK, we got valid partition data */
-                        offset = cchh2blk(&f1.DS1EXT1.llimit, geo);
-                        size  = cchh2blk(&f1.DS1EXT1.ulimit, geo) -
-                                offset + geo->sectors;
-                        if (counter >= state->limit)
-                                break;
-                        put_partition(state, counter + 1,
-                                      offset * (blocksize >> 9),
-                                      size * (blocksize >> 9));
-                        counter++;
-                        blk++;
-                }
-                if (!data)
-                /* Are we not supposed to report this ? */
-                        goto out_readerr;
-        } else {
                 /*
-                 * Old style LNX1 or unlabeled disk
+                 * check if VOL1 label is available
+                 * if not, something is wrong, skipping partition detection
                  */
-                if (strncmp(type, "LNX1", 4) == 0)
-                        printk ("LNX1/%8s:", name);
-                else
-                        printk("(nonl)/%8s:", name);
-                offset = (info->label_block + 1);
-                size = i_size >> 9;
-                put_partition(state, 1, offset*(blocksize >> 9),
-                              size-offset*(blocksize >> 9));
+                if (strncmp(type, "VOL1",  4) == 0) {
+                        printk("VOL1/%8s:", name);
+                        /*
+                         * get block number and read then go through format1
+                         * labels
+                         */
+                        blk = cchhb2blk(&label->vol.vtoc, geo) + 1;
+                        counter = 0;
+                        data = read_dev_sector(bdev, blk * (blocksize/512),
+                                               &sect);
+                        while (data != NULL) {
+                                struct vtoc_format1_label f1;
+
+                                memcpy(&f1, data,
+                                       sizeof(struct vtoc_format1_label));
+                                put_dev_sector(sect);
+
+                                /* skip FMT4 / FMT5 / FMT7 labels */
+                                if (f1.DS1FMTID == _ascebc['4']
+                                    || f1.DS1FMTID == _ascebc['5']
+                                    || f1.DS1FMTID == _ascebc['7']) {
+                                        blk++;
+                                        data = read_dev_sector(bdev, blk *
+                                                               (blocksize/512),
+                                                                &sect);
+                                        continue;
+                                }
+
+                                /* only FMT1 valid at this point */
+                                if (f1.DS1FMTID != _ascebc['1'])
+                                        break;
+
+                                /* OK, we got valid partition data */
+                                offset = cchh2blk(&f1.DS1EXT1.llimit, geo);
+                                size  = cchh2blk(&f1.DS1EXT1.ulimit, geo) -
+                                        offset + geo->sectors;
+                                if (counter >= state->limit)
+                                        break;
+                                put_partition(state, counter + 1,
+                                              offset * (blocksize >> 9),
+                                              size * (blocksize >> 9));
+                                counter++;
+                                blk++;
+                                data = read_dev_sector(bdev,
+                                                       blk * (blocksize/512),
+                                                       &sect);
+                        }
+
+                        if (!data)
+                                /* Are we not supposed to report this ? */
+                                goto out_readerr;
+                } else
+                        printk(KERN_WARNING "Warning, expected Label VOL1 not "
+                               "found, treating as CDL formated Disk");
+
         }
 
         printk("\n");
diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
index 99873a2b4cbc..e7dd1d4e3473 100644
--- a/fs/partitions/ldm.c
+++ b/fs/partitions/ldm.c
@@ -677,15 +677,24 @@ static bool ldm_create_data_partitions (struct parsed_partitions *pp,
  * Return:  -1 Error, the calculated offset exceeded the size of the buffer
  *           n OK, a range-checked offset into buffer
  */
-static int ldm_relative (const u8 *buffer, int buflen, int base, int offset)
+static int ldm_relative(const u8 *buffer, int buflen, int base, int offset)
 {
 
         base += offset;
-        if ((!buffer) || (offset < 0) || (base > buflen))
+        if (!buffer || offset < 0 || base > buflen) {
+                if (!buffer)
+                        ldm_error("!buffer");
+                if (offset < 0)
+                        ldm_error("offset (%d) < 0", offset);
+                if (base > buflen)
+                        ldm_error("base (%d) > buflen (%d)", base, buflen);
                 return -1;
-        if ((base + buffer[base]) >= buflen)
+        }
+        if (base + buffer[base] >= buflen) {
+                ldm_error("base (%d) + buffer[base] (%d) >= buflen (%d)", base,
+                                buffer[base], buflen);
                 return -1;
-
+        }
         return buffer[base] + offset + 1;
 }
 
@@ -1054,60 +1063,98 @@ static bool ldm_parse_prt3(const u8 *buffer, int buflen, struct vblk *vb)
  * Return:  'true'   @vb contains a Volume VBLK
  *          'false'  @vb contents are not defined
  */
-static bool ldm_parse_vol5 (const u8 *buffer, int buflen, struct vblk *vb)
+static bool ldm_parse_vol5(const u8 *buffer, int buflen, struct vblk *vb)
 {
-        int r_objid, r_name, r_vtype, r_child, r_size, r_id1, r_id2, r_size2;
-        int r_drive, len;
+        int r_objid, r_name, r_vtype, r_disable_drive_letter, r_child, r_size;
+        int r_id1, r_id2, r_size2, r_drive, len;
         struct vblk_volu *volu;
 
-        BUG_ON (!buffer || !vb);
-
-        r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
-        r_name   = ldm_relative (buffer, buflen, 0x18, r_objid);
-        r_vtype  = ldm_relative (buffer, buflen, 0x18, r_name);
-        r_child  = ldm_relative (buffer, buflen, 0x2E, r_vtype);
-        r_size   = ldm_relative (buffer, buflen, 0x3E, r_child);
-
-        if (buffer[0x12] & VBLK_FLAG_VOLU_ID1)
-                r_id1 = ldm_relative (buffer, buflen, 0x53, r_size);
-        else
+        BUG_ON(!buffer || !vb);
+        r_objid = ldm_relative(buffer, buflen, 0x18, 0);
+        if (r_objid < 0) {
+                ldm_error("r_objid %d < 0", r_objid);
+                return false;
+        }
+        r_name = ldm_relative(buffer, buflen, 0x18, r_objid);
+        if (r_name < 0) {
+                ldm_error("r_name %d < 0", r_name);
+                return false;
+        }
+        r_vtype = ldm_relative(buffer, buflen, 0x18, r_name);
+        if (r_vtype < 0) {
+                ldm_error("r_vtype %d < 0", r_vtype);
+                return false;
+        }
+        r_disable_drive_letter = ldm_relative(buffer, buflen, 0x18, r_vtype);
+        if (r_disable_drive_letter < 0) {
+                ldm_error("r_disable_drive_letter %d < 0",
+                                r_disable_drive_letter);
+                return false;
+        }
+        r_child = ldm_relative(buffer, buflen, 0x2D, r_disable_drive_letter);
+        if (r_child < 0) {
+                ldm_error("r_child %d < 0", r_child);
+                return false;
+        }
+        r_size = ldm_relative(buffer, buflen, 0x3D, r_child);
+        if (r_size < 0) {
+                ldm_error("r_size %d < 0", r_size);
+                return false;
+        }
+        if (buffer[0x12] & VBLK_FLAG_VOLU_ID1) {
+                r_id1 = ldm_relative(buffer, buflen, 0x52, r_size);
+                if (r_id1 < 0) {
+                        ldm_error("r_id1 %d < 0", r_id1);
+                        return false;
+                }
+        } else
                 r_id1 = r_size;
-
-        if (buffer[0x12] & VBLK_FLAG_VOLU_ID2)
-                r_id2 = ldm_relative (buffer, buflen, 0x53, r_id1);
-        else
+        if (buffer[0x12] & VBLK_FLAG_VOLU_ID2) {
+                r_id2 = ldm_relative(buffer, buflen, 0x52, r_id1);
+                if (r_id2 < 0) {
+                        ldm_error("r_id2 %d < 0", r_id2);
+                        return false;
+                }
+        } else
                 r_id2 = r_id1;
-
-        if (buffer[0x12] & VBLK_FLAG_VOLU_SIZE)
-                r_size2 = ldm_relative (buffer, buflen, 0x53, r_id2);
-        else
+        if (buffer[0x12] & VBLK_FLAG_VOLU_SIZE) {
+                r_size2 = ldm_relative(buffer, buflen, 0x52, r_id2);
+                if (r_size2 < 0) {
+                        ldm_error("r_size2 %d < 0", r_size2);
+                        return false;
+                }
+        } else
                 r_size2 = r_id2;
-
-        if (buffer[0x12] & VBLK_FLAG_VOLU_DRIVE)
-                r_drive = ldm_relative (buffer, buflen, 0x53, r_size2);
-        else
+        if (buffer[0x12] & VBLK_FLAG_VOLU_DRIVE) {
+                r_drive = ldm_relative(buffer, buflen, 0x52, r_size2);
+                if (r_drive < 0) {
+                        ldm_error("r_drive %d < 0", r_drive);
+                        return false;
+                }
+        } else
                 r_drive = r_size2;
-
         len = r_drive;
-        if (len < 0)
+        if (len < 0) {
+                ldm_error("len %d < 0", len);
                 return false;
-
+        }
         len += VBLK_SIZE_VOL5;
-        if (len != BE32 (buffer + 0x14))
+        if (len > BE32(buffer + 0x14)) {
+                ldm_error("len %d > BE32(buffer + 0x14) %d", len,
+                                BE32(buffer + 0x14));
                 return false;
-
+        }
         volu = &vb->vblk.volu;
-
-        ldm_get_vstr (buffer + 0x18 + r_name,  volu->volume_type,
-                sizeof (volu->volume_type));
-        memcpy (volu->volume_state, buffer + 0x19 + r_vtype,
-                        sizeof (volu->volume_state));
-        volu->size = ldm_get_vnum (buffer + 0x3E + r_child);
-        volu->partition_type = buffer[0x42 + r_size];
-        memcpy (volu->guid, buffer + 0x43 + r_size,  sizeof (volu->guid));
+        ldm_get_vstr(buffer + 0x18 + r_name, volu->volume_type,
+                        sizeof(volu->volume_type));
+        memcpy(volu->volume_state, buffer + 0x18 + r_disable_drive_letter,
+                        sizeof(volu->volume_state));
+        volu->size = ldm_get_vnum(buffer + 0x3D + r_child);
+        volu->partition_type = buffer[0x41 + r_size];
+        memcpy(volu->guid, buffer + 0x42 + r_size, sizeof(volu->guid));
         if (buffer[0x12] & VBLK_FLAG_VOLU_DRIVE) {
-                ldm_get_vstr (buffer + 0x53 + r_size,  volu->drive_hint,
-                        sizeof (volu->drive_hint));
+                ldm_get_vstr(buffer + 0x52 + r_size, volu->drive_hint,
+                                sizeof(volu->drive_hint));
         }
         return true;
 }
diff --git a/fs/partitions/ldm.h b/fs/partitions/ldm.h
index d2e6a3046939..80f63b5fdd9f 100644
--- a/fs/partitions/ldm.h
+++ b/fs/partitions/ldm.h
@@ -68,7 +68,7 @@ struct parsed_partitions;
 #define VBLK_SIZE_DSK3          12
 #define VBLK_SIZE_DSK4          45
 #define VBLK_SIZE_PRT3          28
-#define VBLK_SIZE_VOL5          59
+#define VBLK_SIZE_VOL5          58
 
 /* component types */
 #define COMP_STRIPE             0x01            /* Stripe-set */