Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

fs/ntfs/ChangeLog

+2 −0
Original line number Diff line number Diff line
@@ -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.

fs/ntfs/dir.c

+4 −8
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ MFT_REF ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, const ntfschar *uname, 
				name->len = 0;

				*res = name;

			} else {

				if (name)

				kfree(name);

				*res = NULL;

			}
@@ -444,7 +443,6 @@ MFT_REF ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, const ntfschar *uname, 
				name->len = 0;

				*res = name;

			} else {

				if (name)

				kfree(name);

				*res = NULL;

			}
@@ -1462,9 +1460,7 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
		unlock_page(ia_page);

		ntfs_unmap_page(ia_page);

	}

	if (ir)

	kfree(ir);

	if (name)

	kfree(name);

	if (ctx)

		ntfs_attr_put_search_ctx(ctx);

fs/ntfs/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 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);

		/* Return the error code. */

		return (struct dentry *)dent_inode;

fs/ntfs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -1193,7 +1193,6 @@ 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);

	/* Get the inode. */

	tmp_ino = ntfs_iget(vol->sb, MREF(mref));