Commit 0f62de2c authored by Tiger Yang's avatar Tiger Yang Committed by Mark Fasheh
Browse files

ocfs2: Fix directory link count checks in ocfs2_link() 



Remove the redundant "i_nlink >= OCFS2_LINK_MAX" check and adds an unlinked
directory check in ocfs2_link().

Signed-off-by: default avatarTiger Yang <tiger.yang@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent a663e305

fs/ocfs2/namei.c

+5 −5
Original line number Diff line number Diff line
@@ -641,11 +641,6 @@ static int ocfs2_link(struct dentry *old_dentry, 
		goto bail;

	}



	if (inode->i_nlink >= OCFS2_LINK_MAX) {

		err = -EMLINK;

		goto bail;

	}



	handle = ocfs2_alloc_handle(osb);

	if (handle == NULL) {

		err = -ENOMEM;
@@ -659,6 +654,11 @@ static int ocfs2_link(struct dentry *old_dentry, 
		goto bail;

	}



	if (!dir->i_nlink) {

		err = -ENOENT;

		goto bail;

	}



	err = ocfs2_check_dir_for_entry(dir, dentry->d_name.name,

					dentry->d_name.len);

	if (err)