projects
/
platform
/
kernel
/
linux-arm64.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block
[platform/kernel/linux-arm64.git]
/
fs
/
xfs
/
xfs_aops.c
diff --git
a/fs/xfs/xfs_aops.c
b/fs/xfs/xfs_aops.c
index
1b19b9c
..
db2cfb0
100644
(file)
--- a/
fs/xfs/xfs_aops.c
+++ b/
fs/xfs/xfs_aops.c
@@
-1217,7
+1217,7
@@
__xfs_get_blocks(
lockmode = XFS_ILOCK_EXCL;
xfs_ilock(ip, lockmode);
} else {
- lockmode = xfs_ilock_map_shared(ip);
+ lockmode = xfs_ilock_
data_
map_shared(ip);
}
ASSERT(offset <= mp->m_super->s_maxbytes);