Commit f0e2d93c authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Niv Sardi
Browse files

[XFS] Remove unused arg from kmem_free() 



kmem_free() function takes (ptr, size) arguments but doesn't actually use
second one.

This patch removes size argument from all callsites.

SGI-PV: 981498
SGI-Modid: xfs-linux-melb:xfs-kern:31050a

Signed-off-by: default avatarDenys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 7c12f296

fs/xfs/linux-2.6/kmem.c

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize, 
}



void

kmem_free(void *ptr, size_t size)

kmem_free(void *ptr)

{

	if (!is_vmalloc_addr(ptr)) {

		kfree(ptr);
@@ -110,7 +110,7 @@ kmem_realloc(void *ptr, size_t newsize, size_t oldsize, 
		if (new)

			memcpy(new, ptr,

				((oldsize < newsize) ? oldsize : newsize));

		kmem_free(ptr, oldsize);

		kmem_free(ptr);

	}

	return new;

}

fs/xfs/linux-2.6/kmem.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ extern void *kmem_alloc(size_t, unsigned int __nocast); 
extern void *kmem_zalloc(size_t, unsigned int __nocast);

extern void *kmem_zalloc_greedy(size_t *, size_t, size_t, unsigned int __nocast);

extern void *kmem_realloc(void *, size_t, size_t, unsigned int __nocast);

extern void  kmem_free(void *, size_t);

extern void  kmem_free(void *);



/*

 * Zone interfaces

fs/xfs/linux-2.6/xfs_buf.c

+4 −5
Original line number Diff line number Diff line
@@ -310,8 +310,7 @@ _xfs_buf_free_pages( 
	xfs_buf_t	*bp)

{

	if (bp->b_pages != bp->b_page_array) {

		kmem_free(bp->b_pages,

			  bp->b_page_count * sizeof(struct page *));

		kmem_free(bp->b_pages);

	}

}
@@ -1398,7 +1397,7 @@ STATIC void 
xfs_free_bufhash(

	xfs_buftarg_t		*btp)

{

	kmem_free(btp->bt_hash, (1<<btp->bt_hashshift) * sizeof(xfs_bufhash_t));

	kmem_free(btp->bt_hash);

	btp->bt_hash = NULL;

}
@@ -1444,7 +1443,7 @@ xfs_free_buftarg( 
	xfs_unregister_buftarg(btp);

	kthread_stop(btp->bt_task);



	kmem_free(btp, sizeof(*btp));

	kmem_free(btp);

}



STATIC int
@@ -1575,7 +1574,7 @@ xfs_alloc_buftarg( 
	return btp;



error:

	kmem_free(btp, sizeof(*btp));

	kmem_free(btp);

	return NULL;

}

fs/xfs/linux-2.6/xfs_super.c

+4 −4
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ xfssyncd( 
			list_del(&work->w_list);

			if (work == &mp->m_sync_work)

				continue;

			kmem_free(work, sizeof(struct bhv_vfs_sync_work));

			kmem_free(work);

		}

	}
@@ -1222,7 +1222,7 @@ xfs_fs_remount( 
	error = xfs_parseargs(mp, options, args, 1);

	if (!error)

		error = xfs_mntupdate(mp, flags, args);

	kmem_free(args, sizeof(*args));

	kmem_free(args);

	return -error;

}
@@ -1369,7 +1369,7 @@ xfs_fs_fill_super( 


	xfs_itrace_exit(XFS_I(sb->s_root->d_inode));



	kmem_free(args, sizeof(*args));

	kmem_free(args);

	return 0;



fail_vnrele:
@@ -1384,7 +1384,7 @@ fail_unmount: 
	xfs_unmount(mp, 0, NULL);



fail_vfsop:

	kmem_free(args, sizeof(*args));

	kmem_free(args);

	return -error;

}

fs/xfs/quota/xfs_dquot_item.c

+2 −2
Original line number Diff line number Diff line
@@ -576,8 +576,8 @@ xfs_qm_qoffend_logitem_committed( 
	 * xfs_trans_delete_ail() drops the AIL lock.

	 */

	xfs_trans_delete_ail(qfs->qql_item.li_mountp, (xfs_log_item_t *)qfs);

	kmem_free(qfs, sizeof(xfs_qoff_logitem_t));

	kmem_free(qfe, sizeof(xfs_qoff_logitem_t));

	kmem_free(qfs);

	kmem_free(qfe);

	return (xfs_lsn_t)-1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE