Import 2.0.35pre7

diff --git a/drivers/block/ide-floppy.c b/drivers/block/ide-floppy.c
index 263f1ab8430f3223c1ebd6d805191136d0572f37..d4622cee4ee9ff13b655477efb5f7c889545c71c 100644 (file)
--- a/drivers/block/ide-floppy.c
+++ b/drivers/block/ide-floppy.c
@@ -1088,7 +1088,7 @@ static int idefloppy_get_flexible_disk_page (ide_drive_t *drive)
        lba_capacity = floppy->blocks * floppy->block_size;
        if (capacity != lba_capacity) {
                if (!lba_capacity)
-                       printk(KERN_NOTICE "%s: no media in the drive\n");
+                       printk(KERN_NOTICE "%s: no media in the drive\n", drive->name);
                else printk (KERN_NOTICE "%s: The drive reports both %d and %d bytes as its capacity\n",
                             drive->name, capacity, lba_capacity);
                capacity = IDEFLOPPY_MIN(capacity, lba_capacity);

diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index 38ce8af2c146a5b4b04603f617a19ac6c2c2f72e..c49481e67296e1f481e8a0e4e38f3f56bdc5dcdf 100644 (file)
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -429,10 +429,10 @@ int fat_dir_ioctl(struct inode * inode, struct file * filp,
        }
        case VFAT_IOCTL_READDIR_SHORT: {
                struct dirent *d1 = (struct dirent *)arg;
-               put_user(0, &d1->d_reclen);
                err = verify_area(VERIFY_WRITE, d1, sizeof(struct dirent[2]));
                if (err)
                        return err;
+               put_user(0, &d1->d_reclen);
                return fat_readdirx(inode,filp,(void *)arg,
                                    vfat_ioctl_fill, NULL, 1, 0, 1);
        }