Commit 251c8427 authored by Jesper Juhl's avatar Jesper Juhl Committed by Anton Altaparmakov
Browse files

NTFS: Remove checks for NULL before calling kfree() since kfree() does the


      checking itself.  (Jesper Juhl)
Signed-off-by: default avatarJesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: default avatarAnton Altaparmakov <aia21@cantab.net>
parent 53d59aad
......@@ -103,6 +103,8 @@ ToDo/Notes:
- Modify ->readpage and ->writepage (fs/ntfs/aops.c) so they detect and
handle the case where an attribute is converted from resident to
non-resident by a concurrent file write.
- Remove checks for NULL before calling kfree() since kfree() does the
checking itself. (Jesper Juhl)
2.1.22 - Many bug and race fixes and error handling improvements.
......
......@@ -183,8 +183,7 @@ found_it:
name->len = 0;
*res = name;
} else {
if (name)
kfree(name);
kfree(name);
*res = NULL;
}
mref = le64_to_cpu(ie->data.dir.indexed_file);
......@@ -444,8 +443,7 @@ found_it2:
name->len = 0;
*res = name;
} else {
if (name)
kfree(name);
kfree(name);
*res = NULL;
}
mref = le64_to_cpu(ie->data.dir.indexed_file);
......@@ -1462,10 +1460,8 @@ err_out:
unlock_page(ia_page);
ntfs_unmap_page(ia_page);
}
if (ir)
kfree(ir);
if (name)
kfree(name);
kfree(ir);
kfree(name);
if (ctx)
ntfs_attr_put_search_ctx(ctx);
if (m)
......
......@@ -153,8 +153,7 @@ static struct dentry *ntfs_lookup(struct inode *dir_ino, struct dentry *dent,
ntfs_error(vol->sb, "ntfs_iget(0x%lx) failed with "
"error code %li.", dent_ino,
PTR_ERR(dent_inode));
if (name)
kfree(name);
kfree(name);
/* Return the error code. */
return (struct dentry *)dent_inode;
}
......
......@@ -1193,8 +1193,7 @@ static BOOL load_and_init_quota(ntfs_volume *vol)
return FALSE;
}
/* We do not care for the type of match that was found. */
if (name)
kfree(name);
kfree(name);
/* Get the inode. */
tmp_ino = ntfs_iget(vol->sb, MREF(mref));
if (IS_ERR(tmp_ino) || is_bad_inode(tmp_ino)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment