Commit e38a5739 authored Apr 14, 2015 by Joseph Qi Committed by Linus Torvalds Apr 14, 2015

ocfs2: use actual name length when find entry in ocfs2_orphan_del()

If the namelen is 20 and name only has actual length 16, it will fail in
ocfs2_find_entry because of mismatch.  So use actual name length when find
entry.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Signed-off-by: Yiwen Jiang <jiangyiwen@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent e073fc58

fs/ocfs2/namei.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2322,10 +2322,10 @@ int ocfs2_orphan_del(struct ocfs2_super *osb,

		trace_ocfs2_orphan_del(
		(unsigned long long)OCFS2_I(orphan_dir_inode)->ip_blkno,
		name, namelen);
		name, strlen(name));

		/* find it's spot in the orphan directory */
		status = ocfs2_find_entry(name, namelen, orphan_dir_inode,
		status = ocfs2_find_entry(name, strlen(name), orphan_dir_inode,
		&lookup);
		if (status) {
		mlog_errno(status);

Admin message