From 703aa13c649a2be86c33556312bcd774b6e83a49 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 23 Nov 2007 15:11:50 -0500 Subject: [PATCH] Import 2.0.35pre7 --- drivers/block/ide-floppy.c | 2 +- fs/fat/dir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/ide-floppy.c b/drivers/block/ide-floppy.c index 263f1ab8430f..d4622cee4ee9 100644 --- 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 38ce8af2c146..c49481e67296 100644 --- 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); } -- 2.39.5