diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 21:45:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 21:45:44 -0800 |
| commit | bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e (patch) | |
| tree | 3fb4c0ae65f0c13be884280755cf65314a93ebce /drivers/scsi/sd.c | |
| parent | 6df944c5f8194a1010f7166bcdd48667637f1af8 (diff) | |
| parent | 2cbed8906fd1f3c6cc17cdf8aac1bfad2da7960c (diff) | |
| download | kernel_replicant_linux-bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e.tar.gz kernel_replicant_linux-bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e.tar.bz2 kernel_replicant_linux-bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev:
[PATCH] fix bogus argument of blkdev_put() in pktcdvd
[PATCH 2/2] documnt FMODE_ constants
[PATCH 1/2] kill FMODE_NDELAY_NOW
[PATCH] clean up blkdev_get a little bit
[PATCH] Fix block dev compat ioctl handling
[PATCH] kill obsolete temporary comment in swsusp_close()
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index c9e1242eaf25..5081b3981d3c 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -757,7 +757,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, * access to the device is prohibited. */ error = scsi_nonblockable_ioctl(sdp, cmd, p, - (mode & FMODE_NDELAY_NOW) != 0); + (mode & FMODE_NDELAY) != 0); if (!scsi_block_when_processing_errors(sdp) || !error) return error; |