projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek', 'for-3.13/i2c-hid',...
[linux-2.6-block.git]
/
fs
/
ocfs2
/
aops.c
diff --git
a/fs/ocfs2/aops.c
b/fs/ocfs2/aops.c
index 94417a85ce6eecce9ce3367365fb2d40581c5a7e..f37d3c0e20535eacce542c7184f48d8b509884a2 100644
(file)
--- a/
fs/ocfs2/aops.c
+++ b/
fs/ocfs2/aops.c
@@
-2044,7
+2044,7
@@
int ocfs2_write_end_nolock(struct address_space *mapping,
out_write_size:
pos += copied;
- if (pos > i
node->i_size
) {
+ if (pos > i
_size_read(inode)
) {
i_size_write(inode, pos);
mark_inode_dirty(inode);
}