git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
fs
/
dax.c
diff --git
a/fs/dax.c
b/fs/dax.c
index d2c90bf1969aaf4fcb8a4cfce96e9c2380b38c3f..fe5e33810cd444b1dd40ee659aaa6de5bf43a568 100644
(file)
--- a/
fs/dax.c
+++ b/
fs/dax.c
@@
-1187,7
+1187,7
@@
dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,
unsigned flags = 0;
if (iov_iter_rw(iter) == WRITE) {
unsigned flags = 0;
if (iov_iter_rw(iter) == WRITE) {
- lockdep_assert_held_
exclusiv
e(&inode->i_rwsem);
+ lockdep_assert_held_
writ
e(&inode->i_rwsem);
flags |= IOMAP_WRITE;
} else {
lockdep_assert_held(&inode->i_rwsem);
flags |= IOMAP_WRITE;
} else {
lockdep_assert_held(&inode->i_rwsem);