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

Commit 3914ed0c authored by Julia Lawall's avatar Julia Lawall Committed by Joel Becker
Browse files

fs/ocfs2/dlm: Drop memory allocation cast 

Drop cast on the result of kmalloc and similar functions.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@@
type T;
@@

- (T *)
  (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...))
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent c1631d4a

fs/ocfs2/dlm/dlmlock.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ struct dlm_lock * dlm_new_lock(int type, u8 node, u64 cookie, 
	struct dlm_lock *lock;

	int kernel_allocated = 0;



	lock = (struct dlm_lock *) kmem_cache_zalloc(dlm_lock_cache, GFP_NOFS);

	lock = kmem_cache_zalloc(dlm_lock_cache, GFP_NOFS);

	if (!lock)

		return NULL;

fs/ocfs2/dlm/dlmmaster.c

+6 −12
Original line number Diff line number Diff line
@@ -617,13 +617,11 @@ struct dlm_lock_resource *dlm_new_lockres(struct dlm_ctxt *dlm, 
{

	struct dlm_lock_resource *res = NULL;



	res = (struct dlm_lock_resource *)

				kmem_cache_zalloc(dlm_lockres_cache, GFP_NOFS);

	res = kmem_cache_zalloc(dlm_lockres_cache, GFP_NOFS);

	if (!res)

		goto error;



	res->lockname.name = (char *)

				kmem_cache_zalloc(dlm_lockname_cache, GFP_NOFS);

	res->lockname.name = kmem_cache_zalloc(dlm_lockname_cache, GFP_NOFS);

	if (!res->lockname.name)

		goto error;
@@ -757,8 +755,7 @@ struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm, 
		spin_unlock(&dlm->spinlock);

		mlog(0, "allocating a new resource\n");

		/* nothing found and we need to allocate one. */

		alloc_mle = (struct dlm_master_list_entry *)

			kmem_cache_alloc(dlm_mle_cache, GFP_NOFS);

		alloc_mle = kmem_cache_alloc(dlm_mle_cache, GFP_NOFS);

		if (!alloc_mle)

			goto leave;

		res = dlm_new_lockres(dlm, lockid, namelen);
@@ -1542,8 +1539,7 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data, 
			spin_unlock(&dlm->master_lock);

			spin_unlock(&dlm->spinlock);



			mle = (struct dlm_master_list_entry *)

				kmem_cache_alloc(dlm_mle_cache, GFP_NOFS);

			mle = kmem_cache_alloc(dlm_mle_cache, GFP_NOFS);

			if (!mle) {

				response = DLM_MASTER_RESP_ERROR;

				mlog_errno(-ENOMEM);
@@ -2458,8 +2454,7 @@ static int dlm_migrate_lockres(struct dlm_ctxt *dlm, 
		goto leave;

	}



	mle = (struct dlm_master_list_entry *) kmem_cache_alloc(dlm_mle_cache,

								GFP_NOFS);

	mle = kmem_cache_alloc(dlm_mle_cache, GFP_NOFS);

	if (!mle) {

		mlog_errno(ret);

		goto leave;
@@ -3041,8 +3036,7 @@ int dlm_migrate_request_handler(struct o2net_msg *msg, u32 len, void *data, 
	hash = dlm_lockid_hash(name, namelen);



	/* preallocate.. if this fails, abort */

	mle = (struct dlm_master_list_entry *) kmem_cache_alloc(dlm_mle_cache,

							 GFP_NOFS);

	mle = kmem_cache_alloc(dlm_mle_cache, GFP_NOFS);



	if (!mle) {

		ret = -ENOMEM;