6 files changed, 27 insertions, 16 deletions

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 94268c75d04f..424995073c6b 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -90,7 +90,7 @@ static struct atari_disk_type {
         unsigned        blocks;         /* total number of blocks */
         unsigned        fdc_speed;      /* fdc_speed setting */
         unsigned        stretch;        /* track doubling ? */
-} disk_type[] = {
+} atari_disk_type[] = {
         { "d360",  9, 720, 0, 0},       /*  0: 360kB diskette */
         { "D360",  9, 720, 0, 1},       /*  1: 360kb in 720k or 1.2MB drive */
         { "D720",  9,1440, 0, 0},       /*  2: 720kb in 720k or 1.2MB drive */
@@ -658,7 +658,7 @@ static int do_format(int drive, int type, struct atari_format_descr *desc)
                         return -EINVAL;
                 }
                 type = minor2disktype[type].index;
-                UDT = &disk_type[type];
+                UDT = &atari_disk_type[type];
         }
 
         if (!UDT || desc->track >= UDT->blocks/UDT->spt/2 || desc->head >= 2) {
@@ -1064,7 +1064,7 @@ static void fd_rwsec_done1(int status)
                searched for a non-existent sector! */
             !(read_track && FDC_READ(FDCREG_SECTOR) > SUDT->spt)) {
                 if (Probing) {
-                        if (SUDT > disk_type) {
+                        if (SUDT > atari_disk_type) {
                             if (SUDT[-1].blocks > ReqBlock) {
                                 /* try another disk type */
                                 SUDT--;
@@ -1082,7 +1082,7 @@ static void fd_rwsec_done1(int status)
                 } else {        
 /* record not found, but not probing. Maybe stretch wrong ? Restart probing */
                         if (SUD.autoprobe) {
-                                SUDT = disk_type + StartDiskType[DriveType];
+                                SUDT = atari_disk_type + StartDiskType[DriveType];
                                 set_capacity(unit[SelectedDrive].disk,
                                                         SUDT->blocks);
                                 Probing = 1;
@@ -1421,7 +1421,7 @@ repeat:
         if (type == 0) {
                 if (!UDT) {
                         Probing = 1;
-                        UDT = disk_type + StartDiskType[DriveType];
+                        UDT = atari_disk_type + StartDiskType[DriveType];
                         set_capacity(floppy->disk, UDT->blocks);
                         UD.autoprobe = 1;
                 }
@@ -1439,7 +1439,7 @@ repeat:
                         goto repeat;
                 }
                 type = minor2disktype[type].index;
-                UDT = &disk_type[type];
+                UDT = &atari_disk_type[type];
                 set_capacity(floppy->disk, UDT->blocks);
                 UD.autoprobe = 0;
         }
@@ -1505,7 +1505,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
                         if (minor2disktype[type].drive_types > DriveType)
                                 return -ENODEV;
                         type = minor2disktype[type].index;
-                        dtp = &disk_type[type];
+                        dtp = &atari_disk_type[type];
                         if (UD.flags & FTD_MSG)
                             printk (KERN_ERR "floppy%d: found dtp %p name %s!\n",
                                 drive, dtp, dtp->name);
@@ -1576,7 +1576,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
                                 continue;
                         }
                         setidx = minor2disktype[settype].index;
-                        dtp = &disk_type[setidx];
+                        dtp = &atari_disk_type[setidx];
 
                         /* found matching entry ?? */
                         if (   dtp->blocks  == setprm.size 
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 855ce8e5efba..9715be3f2487 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2630,12 +2630,14 @@ static void do_cciss_request(struct request_queue *q)
                         c->Request.CDB[8] = creq->nr_sectors & 0xff;
                         c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0;
                 } else {
+                        u32 upper32 = upper_32_bits(start_blk);
+
                         c->Request.CDBLen = 16;
                         c->Request.CDB[1]= 0;
-                        c->Request.CDB[2]= (start_blk >> 56) & 0xff;    //MSB
-                        c->Request.CDB[3]= (start_blk >> 48) & 0xff;
-                        c->Request.CDB[4]= (start_blk >> 40) & 0xff;
-                        c->Request.CDB[5]= (start_blk >> 32) & 0xff;
+                        c->Request.CDB[2]= (upper32 >> 24) & 0xff;      //MSB
+                        c->Request.CDB[3]= (upper32 >> 16) & 0xff;
+                        c->Request.CDB[4]= (upper32 >>  8) & 0xff;
+                        c->Request.CDB[5]= upper32 & 0xff;
                         c->Request.CDB[6]= (start_blk >> 24) & 0xff;
                         c->Request.CDB[7]= (start_blk >> 16) & 0xff;
                         c->Request.CDB[8]= (start_blk >>  8) & 0xff;
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index b8af22e610df..91ebb007416c 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -973,6 +973,10 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
         lo->transfer = xfer->transfer;
         lo->ioctl = xfer->ioctl;
 
+        if ((lo->lo_flags & LO_FLAGS_AUTOCLEAR) !=
+             (info->lo_flags & LO_FLAGS_AUTOCLEAR))
+                lo->lo_flags ^= LO_FLAGS_AUTOCLEAR;
+
         lo->lo_encrypt_key_size = info->lo_encrypt_key_size;
         lo->lo_init[0] = info->lo_init[0];
         lo->lo_init[1] = info->lo_init[1];
@@ -1331,6 +1335,10 @@ static int lo_release(struct inode *inode, struct file *file)
 
         mutex_lock(&lo->lo_ctl_mutex);
         --lo->lo_refcnt;
+
+        if ((lo->lo_flags & LO_FLAGS_AUTOCLEAR) && !lo->lo_refcnt)
+                loop_clr_fd(lo, inode->i_bdev);
+
         mutex_unlock(&lo->lo_ctl_mutex);
 
         return 0;
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 76096cad798f..8b9549ab4a4e 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -660,7 +660,7 @@ static int pt_open(struct inode *inode, struct file *file)
         pt_identify(tape);
 
         err = -ENODEV;
-        if (!tape->flags & PT_MEDIA)
+        if (!(tape->flags & PT_MEDIA))
                 goto out;
 
         err = -EROFS;
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index e9de1712e5a0..674cd66dcaba 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2212,11 +2212,11 @@ static int pkt_media_speed(struct pktcdvd_device *pd, unsigned *speed)
                 return ret;
         }
 
-        if (!buf[6] & 0x40) {
+        if (!(buf[6] & 0x40)) {
                 printk(DRIVER_NAME": Disc type is not CD-RW\n");
                 return 1;
         }
-        if (!buf[6] & 0x4) {
+        if (!(buf[6] & 0x4)) {
                 printk(DRIVER_NAME": A1 values on media are not valid, maybe not CDRW?\n");
                 return 1;
         }
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 82f4eecc8699..06e23be70904 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -56,6 +56,7 @@
 #include <linux/backing-dev.h>
 #include <linux/blkpg.h>
 #include <linux/writeback.h>
+#include <linux/log2.h>
 
 #include <asm/uaccess.h>
 
@@ -450,7 +451,7 @@ static int __init rd_init(void)
         err = -ENOMEM;
 
         if (rd_blocksize > PAGE_SIZE || rd_blocksize < 512 ||
-                        (rd_blocksize & (rd_blocksize-1))) {
+                        !is_power_of_2(rd_blocksize)) {
                 printk("RAMDISK: wrong blocksize %d, reverting to defaults\n",
                        rd_blocksize);
                 rd_blocksize = BLOCK_SIZE;