diff options
| author | Jesper Juhl <juhl-lkml@dif.dk> | 2005-04-04 14:59:56 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-05 11:42:27 +0100 |
| commit | 251c8427c9c418674fc3c04a11de95dc3661b560 (patch) | |
| tree | b67bab32762a4a64083de64281b1249bccfd9402 | |
| parent | 53d59aad9326199ef5749c97513db498309a057e (diff) | |
NTFS: Remove checks for NULL before calling kfree() since kfree() does the
checking itself. (Jesper Juhl)
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| -rw-r--r-- | fs/ntfs/ChangeLog | 2 | ||||
| -rw-r--r-- | fs/ntfs/dir.c | 12 | ||||
| -rw-r--r-- | fs/ntfs/namei.c | 3 | ||||
| -rw-r--r-- | fs/ntfs/super.c | 3 |
4 files changed, 8 insertions, 12 deletions
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog index b29e0618f35..51428bfce95 100644 --- a/fs/ntfs/ChangeLog +++ b/fs/ntfs/ChangeLog @@ -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. diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c index 95c44577160..a56ca1821ee 100644 --- a/fs/ntfs/dir.c +++ b/fs/ntfs/dir.c @@ -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) diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c index d261e25bd9b..351dbc3b6e4 100644 --- a/fs/ntfs/namei.c +++ b/fs/ntfs/namei.c @@ -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; } diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 78416eb2a16..25fa1d1668d 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -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)) { |