diff options
author | Joseph Qi <joseph.qi@huawei.com> | 2015-04-14 18:43:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 19:48:58 -0400 |
commit | e38a573907383b3c57514fe2331322b1fc110eef (patch) | |
tree | 5fb6e3589b7b8b73f2b2c58bfe91e8da9859aa29 /fs/ocfs2 | |
parent | e073fc58dfe6a4c9b614320c1d56bb71cb213ec4 (diff) |
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>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index b5c3a5ea3ee6..49837404541e 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
@@ -2322,10 +2322,10 @@ int ocfs2_orphan_del(struct ocfs2_super *osb, | |||
2322 | 2322 | ||
2323 | trace_ocfs2_orphan_del( | 2323 | trace_ocfs2_orphan_del( |
2324 | (unsigned long long)OCFS2_I(orphan_dir_inode)->ip_blkno, | 2324 | (unsigned long long)OCFS2_I(orphan_dir_inode)->ip_blkno, |
2325 | name, namelen); | 2325 | name, strlen(name)); |
2326 | 2326 | ||
2327 | /* find it's spot in the orphan directory */ | 2327 | /* find it's spot in the orphan directory */ |
2328 | status = ocfs2_find_entry(name, namelen, orphan_dir_inode, | 2328 | status = ocfs2_find_entry(name, strlen(name), orphan_dir_inode, |
2329 | &lookup); | 2329 | &lookup); |
2330 | if (status) { | 2330 | if (status) { |
2331 | mlog_errno(status); | 2331 | mlog_errno(status); |