On Wed, 2008-08-13 at 12:34 +0100, David Woodhouse wrote:
> Er, yes. That would be a good idea, wouldn't it? :)
>
> Hold off on pulling the tree for a moment; I'll do that.
Merged this into the appropriate commit:
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -325,6 +325,9 @@ int blkdev_ioctl(struct inode *inode, struct file *file, uns
case BLKDISCARD: {
uint64_t range[2];
+ if (!(file->f_mode & FMODE_WRITE))
+ return -EBADF;
+
if (copy_from_user(range, (void __user *)arg, sizeof(range)))
return -EFAULT;
Please pull (I've left out the REQ_TYPE_FLUSH patch for now)...
The following changes since commit 6dc2b733b2f9605b48fdb7692fce5a3eafe241e4:
Jens Axboe (1):
highmem: use bio_has_data() in the bounce path
are available in the git repository at:
git://git.infradead.org/users/dwmw2/discard-2.6.git master
David Woodhouse (10):
[BLOCK] Fix typo causing compile error in blk_queue_bounce()
[BLOCK] Fix up comments about matching flags between bio and rq
[BLOCK] Add 'discard' request handling
[FAT] Let the block device know when sectors can be discarded
[MTD] Support 'discard sectors' operation in translation layer support core
[MTD] [FTL] Support 'discard sectors' operation.
blktrace: support discard requests
blktrace: simplify flags handling in __blk_add_trace
[BLOCK] Add BLKDISCARD ioctl to allow userspace to discard sectors
[BLOCK] Allow elevators to sort/merge discard requests
OGAWA Hirofumi (1):
[BLOCK] Use WRITE_BARRIER in blkdev_issue_flush(), not (1<<BIO_RW_BARRIER)
block/blk-barrier.c | 71 ++++++++++++++++++++++++++++++++++++++-
block/blk-core.c | 41 ++++++++++++++--------
block/blk-merge.c | 27 +++++++++-----
block/blk-settings.c | 17 +++++++++
block/blktrace.c | 29 ++++-----------
block/compat_ioctl.c | 1 +
block/elevator.c | 12 +++++-
block/ioctl.c | 76 ++++++++++++++++++++++++++++++++++++++++++
drivers/mtd/ftl.c | 24 +++++++++++++
drivers/mtd/mtd_blkdevs.c | 16 +++++++++
fs/fat/fatent.c | 14 ++++++++
include/linux/bio.h | 14 +++++---
include/linux/blkdev.h | 24 +++++++++++--
include/linux/blktrace_api.h | 4 ++
include/linux/fs.h | 5 ++-
include/linux/mtd/blktrans.h | 2 +
mm/bounce.c | 2 +-
17 files changed, 320 insertions(+), 59 deletions(-)
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@xxxxxxxxx Intel Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
