diff options
| author | Tao Ma <tao.ma@oracle.com> | 2010-03-19 08:04:24 +0100 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-03-19 22:53:52 +0100 |
| commit | b23179681c90a55e2a2083e1dde9f727ecffb2b7 (patch) | |
| tree | 262a3a1f4e7780fbcea841ca9ffc3d5ac0481cd5 | |
| parent | ocfs2: Fix the update of name_offset when removing xattrs (diff) | |
| download | linux-b23179681c90a55e2a2083e1dde9f727ecffb2b7.tar.xz linux-b23179681c90a55e2a2083e1dde9f727ecffb2b7.zip | |
ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block.
You can't store a pointer that you haven't filled in yet and expect it
to work.
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
| -rw-r--r-- | fs/ocfs2/xattr.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 82c2a0b53eb4..3e7773089b96 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -6528,13 +6528,11 @@ static int ocfs2_create_empty_xattr_block(struct inode *inode, int indexed) { int ret; - struct ocfs2_alloc_context *meta_ac; struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); - struct ocfs2_xattr_set_ctxt ctxt = { - .meta_ac = meta_ac, - }; + struct ocfs2_xattr_set_ctxt ctxt; - ret = ocfs2_reserve_new_metadata_blocks(osb, 1, &meta_ac); + memset(&ctxt, 0, sizeof(ctxt)); + ret = ocfs2_reserve_new_metadata_blocks(osb, 1, &ctxt.meta_ac); if (ret < 0) { mlog_errno(ret); return ret; @@ -6556,7 +6554,7 @@ static int ocfs2_create_empty_xattr_block(struct inode *inode, ocfs2_commit_trans(osb, ctxt.handle); out: - ocfs2_free_alloc_context(meta_ac); + ocfs2_free_alloc_context(ctxt.meta_ac); return ret; } |