Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

3 files changed, 7 insertions, 6 deletions

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 1468e8cf712d..0acbfff8ad28 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1816,7 +1816,6 @@ out_blkdev:
 }
 
 #ifdef MODULE
-#include <linux/version.h>
 
 int init_module(void)
 {
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 5eadbb9d4d71..28002de783b6 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3714,6 +3714,12 @@ static int floppy_open(struct inode *inode, struct file *filp)
                 USETF(FD_VERIFY);
         }
 
+        /* set underlying gendisk policy to reflect real ro/rw status */
+        if (UTESTF(FD_DISK_WRITABLE))
+                inode->i_bdev->bd_disk->policy = 0;
+        else
+                inode->i_bdev->bd_disk->policy = 1;
+
         if (UDRS->fd_ref == -1 || (UDRS->fd_ref && (filp->f_flags & O_EXCL)))
                 goto out2;
 
@@ -3770,8 +3776,7 @@ static int floppy_open(struct inode *inode, struct file *filp)
         /* Allow ioctls if we have write-permissions even if read-only open.
          * Needed so that programs such as fdrawcmd still can work on write
          * protected disks */
-        if (filp->f_mode & 2
-            || permission(filp->f_dentry->d_inode, 2, NULL) == 0)
+        if ((filp->f_mode & FMODE_WRITE) || !file_permission(filp, MAY_WRITE))
                 filp->private_data = (void *)8;
 
         if (UFDCS->rawcmd == 1)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index a280e679b1ca..59e5982a5db3 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -511,14 +511,11 @@ static void pkt_queue_bio(struct pktcdvd_device *pd, struct bio *bio)
  */
 static void pkt_iosched_process_queue(struct pktcdvd_device *pd)
 {
-        request_queue_t *q;
 
         if (atomic_read(&pd->iosched.attention) == 0)
                 return;
         atomic_set(&pd->iosched.attention, 0);
 
-        q = bdev_get_queue(pd->bdev);
-
         for (;;) {
                 struct bio *bio;
                 int reads_queued, writes_queued;