net: stmmac: Fix stmmac_get_rx_hwtstamp()

[sfrench/cifs-2.6.git] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index bb715b2fcfb80f7fb50903a61d1b22d405af7ddf..93d088ffc05c679c7f0f35b847eb1d4341fc3761 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1740,6 +1740,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)
@@ -1892,6 +1894,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);