patch-2.1.100 linux/drivers/block/floppy.c

• Lines: 43
• Date: Thu May 7 18:13:47 1998
• Orig file: v2.1.99/linux/drivers/block/floppy.c
• Orig date: Sat May 2 14:19:52 1998

diff -u --recursive --new-file v2.1.99/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -1825,7 +1825,6 @@
 	if (!initialising)
 		show_floppy();
 	cancel_activity();
-	sti();
 
 	floppy_enable_hlt();
 	fd_disable_dma();
@@ -2876,7 +2875,6 @@
 		printk("sect=%ld cmd=%d\n", CURRENT->sector, CURRENT->cmd);
 		return;
 	}
-	sti();
 	if (fdc_busy){
 		/* fdc busy, this new request will be treated when the
 		   current one is done */
@@ -3208,7 +3206,7 @@
 	    (g->stretch&~(FD_STRETCH|FD_SWAPSIDES)) != 0)
 		return -EINVAL;
 	if (type){
-		if (!suser())
+		if (!capable(CAP_SYS_ADMIN))
 			return -EPERM;
 		LOCK_FDC(drive,1);
 		for (cnt = 0; cnt < N_DRIVE; cnt++){
@@ -3373,7 +3371,7 @@
 			return _COPYOUT(loc);
 		}
 		case BLKRASET:
-			if(!suser()) return -EACCES;
+			if(!capable(CAP_SYS_ADMIN)) return -EACCES;
 			if(param > 0xff) return -EINVAL;
 			read_ahead[MAJOR(inode->i_rdev)] = param;
 			return 0;
@@ -3381,7 +3379,7 @@
 			return put_user(read_ahead[MAJOR(inode->i_rdev)],
 					(long *) param);
 		case BLKFLSBUF:
-			if(!suser()) return -EACCES;
+			if(!capable(CAP_SYS_ADMIN)) return -EACCES;
 			fsync_dev(inode->i_rdev);
 			invalidate_buffers(inode->i_rdev);
 			return 0;