diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 12:39:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 12:39:14 -0700 |
| commit | 58e57fbd1c7e8833314459555e337364fe5521f3 (patch) | |
| tree | 242a3859387588889c9dcc45915b0dec951f84c3 /drivers/staging | |
| parent | 8a0382f6fceaf0c6479e582e1054f36333ea3d24 (diff) | |
| parent | 0f78ab9899e9d6acb09d5465def618704255963b (diff) | |
| download | kernel_samsung_crespo-58e57fbd1c7e8833314459555e337364fe5521f3.zip kernel_samsung_crespo-58e57fbd1c7e8833314459555e337364fe5521f3.tar.gz kernel_samsung_crespo-58e57fbd1c7e8833314459555e337364fe5521f3.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: (41 commits)
Revert "Seperate read and write statistics of in_flight requests"
cfq-iosched: don't delay async queue if it hasn't dispatched at all
block: Topology ioctls
cfq-iosched: use assigned slice sync value, not default
cfq-iosched: rename 'desktop' sysfs entry to 'low_latency'
cfq-iosched: implement slower async initiate and queue ramp up
cfq-iosched: delay async IO dispatch, if sync IO was just done
cfq-iosched: add a knob for desktop interactiveness
Add a tracepoint for block request remapping
block: allow large discard requests
block: use normal I/O path for discard requests
swapfile: avoid NULL pointer dereference in swapon when s_bdev is NULL
fs/bio.c: move EXPORT* macros to line after function
Add missing blk_trace_remove_sysfs to be in pair with blk_trace_init_sysfs
cciss: fix build when !PROC_FS
block: Do not clamp max_hw_sectors for stacking devices
block: Set max_sectors correctly for stacking devices
cciss: cciss_host_attr_groups should be const
cciss: Dynamically allocate the drive_info_struct for each logical drive.
cciss: Add usage_count attribute to each logical drive in /sys
...
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/dst/dcore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/dst/dcore.c b/drivers/staging/dst/dcore.c index ee16010..c24e4e0 100644 --- a/drivers/staging/dst/dcore.c +++ b/drivers/staging/dst/dcore.c @@ -102,7 +102,7 @@ static int dst_request(struct request_queue *q, struct bio *bio) struct dst_node *n = q->queuedata; int err = -EIO; - if (bio_empty_barrier(bio) && !q->prepare_discard_fn) { + if (bio_empty_barrier(bio) && !blk_queue_discard(q)) { /* * This is a dirty^Wnice hack, but if we complete this * operation with -EOPNOTSUPP like intended, XFS |