]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block.
authorTao Ma <tao.ma@oracle.com>
Fri, 19 Mar 2010 07:04:24 +0000 (15:04 +0800)
committerJoel Becker <joel.becker@oracle.com>
Fri, 19 Mar 2010 21:53:52 +0000 (14:53 -0700)
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>
fs/ocfs2/xattr.c

index 82c2a0b53eb4f0d812e23a97c9be19f2bbf46f40..3e7773089b968d7f29a0986fd65731646d0a382d 100644 (file)
@@ -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;
 }