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

Commit e3a82138 authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: don't pass handle to ocfs2_meta_lock() in ocfs2_mknod() 



Take and drop the locks directly.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent e08dc8b9

fs/ocfs2/namei.c

+9 −7
Original line number Diff line number Diff line
@@ -333,16 +333,16 @@ static int ocfs2_mknod(struct inode *dir, 
	/* get our super block */

	osb = OCFS2_SB(dir->i_sb);



	handle = ocfs2_alloc_handle(osb);

	if (handle == NULL) {

		status = -ENOMEM;

	status = ocfs2_meta_lock(dir, NULL, &parent_fe_bh, 1);

	if (status < 0) {

		if (status != -ENOENT)

			mlog_errno(status);

		goto leave;

		return status;

	}



	status = ocfs2_meta_lock(dir, handle, &parent_fe_bh, 1);

	if (status < 0) {

		if (status != -ENOENT)

	handle = ocfs2_alloc_handle(osb);

	if (handle == NULL) {

		status = -ENOMEM;

		mlog_errno(status);

		goto leave;

	}
@@ -455,6 +455,8 @@ static int ocfs2_mknod(struct inode *dir, 
	if (handle)

		ocfs2_commit_trans(handle);



	ocfs2_meta_unlock(dir, 1);



	if (status == -ENOSPC)

		mlog(0, "Disk is full\n");