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 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
ocfs2
/
buffer_head_io.c
diff --git
a/fs/ocfs2/buffer_head_io.c
b/fs/ocfs2/buffer_head_io.c
index
21c808f
..
f9d5d3f
100644
(file)
--- a/
fs/ocfs2/buffer_head_io.c
+++ b/
fs/ocfs2/buffer_head_io.c
@@
-25,7
+25,6
@@
#include <linux/fs.h>
#include <linux/types.h>
#include <linux/fs.h>
#include <linux/types.h>
-#include <linux/slab.h>
#include <linux/highmem.h>
#include <cluster/masklog.h>
#include <linux/highmem.h>
#include <cluster/masklog.h>
@@
-407,6
+406,7
@@
int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
struct buffer_head *bh)
{
int ret = 0;
struct buffer_head *bh)
{
int ret = 0;
+ struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data;
mlog_entry_void();
mlog_entry_void();
@@
-426,6
+426,7
@@
int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
get_bh(bh); /* for end_buffer_write_sync() */
bh->b_end_io = end_buffer_write_sync;
get_bh(bh); /* for end_buffer_write_sync() */
bh->b_end_io = end_buffer_write_sync;
+ ocfs2_compute_meta_ecc(osb->sb, bh->b_data, &di->i_check);
submit_bh(WRITE, bh);
wait_on_buffer(bh);
submit_bh(WRITE, bh);
wait_on_buffer(bh);