Merge tag 'xfs-4.11-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[mirror_ubuntu-artful-kernel.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index 78b9651576c69b3dc1d7b6c7220b4367059e81b1..99b5b4458a786366a73a442817aaef1d37297267 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1031,6 +1031,11 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
                struct blk_dax_ctl dax = { 0 };
                ssize_t map_len;
 
+               if (fatal_signal_pending(current)) {
+                       ret = -EINTR;
+                       break;
+               }
+
                dax.sector = dax_iomap_sector(iomap, pos);
                dax.size = (length + offset + PAGE_SIZE - 1) & PAGE_MASK;
                map_len = dax_map_atomic(iomap->bdev, &dax);
@@ -1081,8 +1086,12 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,
        loff_t pos = iocb->ki_pos, ret = 0, done = 0;
        unsigned flags = 0;
 
-       if (iov_iter_rw(iter) == WRITE)
+       if (iov_iter_rw(iter) == WRITE) {
+               lockdep_assert_held_exclusive(&inode->i_rwsem);
                flags |= IOMAP_WRITE;
+       } else {
+               lockdep_assert_held(&inode->i_rwsem);
+       }
 
        while (iov_iter_count(iter)) {
                ret = iomap_apply(inode, pos, iov_iter_count(iter), flags, ops,