block_dev: support RFW_NOWAIT on block device nodes
authorChristoph Hellwig <hch@lst.de>
Tue, 29 Aug 2017 14:13:21 +0000 (16:13 +0200)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 4 Sep 2017 23:04:23 +0000 (19:04 -0400)
All support is already there in the generic code, we just need to wire
it up.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/block_dev.c

index 9941dc8..ea21d18 100644 (file)
@@ -1739,6 +1739,8 @@ static int blkdev_open(struct inode * inode, struct file * filp)
         */
        filp->f_flags |= O_LARGEFILE;
 
+       filp->f_mode |= FMODE_NOWAIT;
+
        if (filp->f_flags & O_NDELAY)
                filp->f_mode |= FMODE_NDELAY;
        if (filp->f_flags & O_EXCL)
@@ -1891,6 +1893,9 @@ ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
        if (iocb->ki_pos >= size)
                return -ENOSPC;
 
+       if ((iocb->ki_flags & (IOCB_NOWAIT | IOCB_DIRECT)) == IOCB_NOWAIT)
+               return -EOPNOTSUPP;
+
        iov_iter_truncate(from, size - iocb->ki_pos);
 
        blk_start_plug(&plug);