Ticket #15581: patch-floppy-4.6.5.diff

drivers/block/floppy.c

@@ -866 +866 @@
 }
 
 /* locks the driver */
-static int lock_fdc(int drive)
+static int lock_fdc(int drive, bool interruptible)
 {
         if (WARN(atomic_read(&usage_count) == 0,
                  "Trying to lock fdc while usage count=0\n"))
@@ -2173 +2173 @@
 {
         int ret;
 
-        if (lock_fdc(drive))
+        if (lock_fdc(drive, true))
                 return -EINTR;
 
         set_floppy(drive);
@@ -2960 +2960 @@
 {
         int ret;
 
-        if (lock_fdc(drive))
+        if (lock_fdc(drive, interruptible))
                 return -EINTR;
 
         if (arg == FD_RESET_ALWAYS)
@@ -3243 +3243 @@
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
                 mutex_lock(&open_lock);
-                if (lock_fdc(drive)) {
+                if (lock_fdc(drive, true)) {
                         mutex_unlock(&open_lock);
                         return -EINTR;
                 }
@@ -3263 +3263 @@
         } else {
                 int oldStretch;
 
-                if (lock_fdc(drive))
+                if (lock_fdc(drive, true))
                         return -EINTR;
                 if (cmd != FDDEFPRM) {
                         /* notice a disk change immediately, else
@@ -3349 +3349 @@
         if (type)
                 *g = &floppy_type[type];
         else {
-                if (lock_fdc(drive))
+                if (lock_fdc(drive, false))
                         return -EINTR;
                 if (poll_drive(false, 0) == -EINTR)
                         return -EINTR;
@@ -3433 +3433 @@
                 if (UDRS->fd_ref != 1)
                         /* somebody else has this drive open */
                         return -EBUSY;
-                if (lock_fdc(drive))
+                if (lock_fdc(drive, true))
                         return -EINTR;
 
                 /* do the actual eject. Fails on
@@ -3445 +3445 @@
                 process_fd_request();
                 return ret;
         case FDCLRPRM:
-                if (lock_fdc(drive))
+                if (lock_fdc(drive, true))
                         return -EINTR;
                 current_type[drive] = NULL;
                 floppy_sizes[drive] = MAX_DISK_SIZE << 1;
@@ -3467 +3467 @@
                 UDP->flags &= ~FTD_MSG;
                 return 0;
         case FDFMTBEG:
-                if (lock_fdc(drive))
+                if (lock_fdc(drive, true))
                         return -EINTR;
                 if (poll_drive(true, FD_RAW_NEED_DISK) == -EINTR)
                         return -EINTR;
@@ -3484 +3484 @@
                 return do_format(drive, &inparam.f);
         case FDFMTEND:
         case FDFLUSH:
-                if (lock_fdc(drive))
+                if (lock_fdc(drive, true))
                         return -EINTR;
                 return invalidate_drive(bdev);
         case FDSETEMSGTRESH:
@@ -3507 +3507 @@
                 outparam = UDP;
                 break;
         case FDPOLLDRVSTAT:
-                if (lock_fdc(drive))
+                if (lock_fdc(drive, true))
                         return -EINTR;
                 if (poll_drive(true, FD_RAW_NEED_DISK) == -EINTR)
                         return -EINTR;
@@ -3530 +3530 @@
         case FDRAWCMD:
                 if (type)
                         return -EINVAL;
-                if (lock_fdc(drive))
+                if (lock_fdc(drive, true))
                         return -EINTR;
                 set_floppy(drive);
                 i = raw_cmd_ioctl(cmd, (void __user *)param);
@@ -3539 +3539 @@
                 process_fd_request();
                 return i;
         case FDTWADDLE:
-                if (lock_fdc(drive))
+                if (lock_fdc(drive, true))
                         return -EINTR;
                 twaddle();
                 process_fd_request();
@@ -3585 +3585 @@
                 unsigned int type = UDP->cmos;
                 struct floppy_drive_params *params;
                 const char *name = NULL;
-                char temparea[32];
+                static char temparea[32];
 
                 if (type < ARRAY_SIZE(default_drive_params)) {
                         params = &default_drive_params[type].params;
@@ -3596 +3596 @@
                                 allowed_drive_mask &= ~(1 << drive);
                 } else {
                         params = &default_drive_params[0].params;
-                        snprintf(temparea, sizeof(temparea),
-                                 "unknown type %d (usb?)", type);
+                        sprintf(temparea, "unknown type %d (usb?)", type);
                         name = temparea;
                 }
                 if (name) {
@@ -3663 +3662 @@
 
         opened_bdev[drive] = bdev;
 
-        if (!(mode & (FMODE_READ|FMODE_WRITE))) {
-                res = -EINVAL;
-                goto out;
-        }
-
         res = -ENXIO;
 
         if (!floppy_track_buffer) {
@@ -3711 +3705 @@
         if (UFDCS->rawcmd == 1)
                 UFDCS->rawcmd = 2;
 
-        UDRS->last_checked = 0;
-        clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
-        check_disk_change(bdev);
-        if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags))
-                goto out;
-        if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))
-                goto out;
-
-        res = -EROFS;
-
-        if ((mode & FMODE_WRITE) &&
-                        !test_bit(FD_DISK_WRITABLE_BIT, &UDRS->flags))
-                goto out;
-
+        if (!(mode & FMODE_NDELAY)) {
+                if (mode & (FMODE_READ|FMODE_WRITE)) {
+                        UDRS->last_checked = 0;
+                        clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
+                        check_disk_change(bdev);
+                        if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags))
+                                goto out;
+                        if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))
+                                goto out;
+                }
+                res = -EROFS;
+                if ((mode & FMODE_WRITE) &&
+                    !test_bit(FD_DISK_WRITABLE_BIT, &UDRS->flags))
+                        goto out;
+        }
         mutex_unlock(&open_lock);
         mutex_unlock(&floppy_mutex);
         return 0;
@@ -3752 +3747 @@
                 return DISK_EVENT_MEDIA_CHANGE;
 
         if (time_after(jiffies, UDRS->last_checked + UDP->checkfreq)) {
-                if (lock_fdc(drive))
-                        return -EINTR;
+                lock_fdc(drive, false);
                 poll_drive(false, 0);
                 process_fd_request();
         }
@@ -3852 +3846 @@
                          "VFS: revalidate called on non-open device.\n"))
                         return -EFAULT;
 
-                res = lock_fdc(drive);
-                if (res)
-                        return res;
+                lock_fdc(drive, false);
                 cf = (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags) ||
                       test_bit(FD_VERIFY_BIT, &UDRS->flags));
                 if (!(cf || test_bit(drive, &fake_change) || drive_no_geom(drive))) {