Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2317968 authored by Tao Ma's avatar Tao Ma Committed by Joel Becker
Browse files

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: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent dfe4d3d6

fs/ocfs2/xattr.c

+4 −6
Original line number Diff line number Diff line
@@ -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;

}