git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-2.6.35
[pandora-kernel.git]
/
fs
/
ocfs2
/
aops.c
diff --git
a/fs/ocfs2/aops.c
b/fs/ocfs2/aops.c
index
21441dd
..
3623ca2
100644
(file)
--- a/
fs/ocfs2/aops.c
+++ b/
fs/ocfs2/aops.c
@@
-1735,6
+1735,9
@@
int ocfs2_write_begin_nolock(struct address_space *mapping,
goto out;
}
+ if (data_ac)
+ data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
+
credits = ocfs2_calc_extend_credits(inode->i_sb,
&di->id2.i_list,
clusters_to_alloc);