From 6b87e8bc514b363d283409057b0e5602de3a4eca Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 10 Mar 2010 15:21:10 -0800
Subject: [PATCH] --- yaml --- r: 187155 b: refs/heads/master c:
 0aad92cfea6fec14bd57dd9c283cc6eb023c97bd h: refs/heads/master i:   187153:
 43b7f21ef05d5416a795f064f329d644bac34a7a   187151:
 87bbefa54068f9da64cf5137b7aff68dce6a9d06 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/block/floppy.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index db35f40c2c46..0877a3580e86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 712e1de43ed572886d6913a86eee5e73b7de4318
+refs/heads/master: 0aad92cfea6fec14bd57dd9c283cc6eb023c97bd
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 0b659bb02ad4..67e8e5f366c5 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -3420,8 +3420,6 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
 		    unsigned long param)
 {
-#define FD_IOCTL_ALLOWED (mode & (FMODE_WRITE|FMODE_WRITE_IOCTL))
-
 	int drive = (long)bdev->bd_disk->private_data;
 	int type = ITYPE(UDRS->fd_device);
 	int i;
@@ -3454,7 +3452,7 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
 		return ret;
 
 	/* permission checks */
-	if (((cmd & 0x40) && !FD_IOCTL_ALLOWED) ||
+	if (((cmd & 0x40) && !(mode & (FMODE_WRITE | FMODE_WRITE_IOCTL))) ||
 	    ((cmd & 0x80) && !capable(CAP_SYS_ADMIN)))
 		return -EPERM;