projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "gpio: remove broken irq_to_gpio() interface"
[cascardo/linux.git]
/
fs
/
dax.c
diff --git
a/fs/dax.c
b/fs/dax.c
index
206650f
..
4fd6b0c
100644
(file)
--- a/
fs/dax.c
+++ b/
fs/dax.c
@@
-250,10
+250,10
@@
ssize_t dax_do_io(struct kiocb *iocb, struct inode *inode,
if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ) {
struct address_space *mapping = inode->i_mapping;
if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ) {
struct address_space *mapping = inode->i_mapping;
-
mutex_lock(&inode->i_mutex
);
+
inode_lock(inode
);
retval = filemap_write_and_wait_range(mapping, pos, end - 1);
if (retval) {
retval = filemap_write_and_wait_range(mapping, pos, end - 1);
if (retval) {
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
goto out;
}
}
goto out;
}
}
@@
-265,7
+265,7
@@
ssize_t dax_do_io(struct kiocb *iocb, struct inode *inode,
retval = dax_io(inode, iter, pos, end, get_block, &bh);
if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ)
retval = dax_io(inode, iter, pos, end, get_block, &bh);
if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ)
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
if ((retval > 0) && end_io)
end_io(iocb, pos, retval, bh.b_private);
if ((retval > 0) && end_io)
end_io(iocb, pos, retval, bh.b_private);