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

Commit 33784467 authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman
Browse files

lustre: mdc: Replace uses of OBD_{ALLOC,FREE}_LARGE 

Replace uses of OBD_ALLOC_LARGE by libcfs_kvzalloc and OBD_FREE_LARGE by
kvfree.

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

)

// <smpl>
@@
expression ptr,size;
@@

- OBD_ALLOC_LARGE(ptr,size)
+ ptr = libcfs_kvzalloc(size, GFP_NOFS)

@@
expression ptr,size;
@@

- OBD_FREE_LARGE(ptr, size);
+ kvfree(ptr);
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d0ba716

drivers/staging/lustre/lustre/mdc/mdc_locks.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -746,7 +746,7 @@ static int mdc_finish_enqueue(struct obd_export *exp, 
		LDLM_DEBUG(lock, "layout lock returned by: %s, lvb_len: %d\n",

		LDLM_DEBUG(lock, "layout lock returned by: %s, lvb_len: %d\n",

			ldlm_it2str(it->it_op), lvb_len);

			ldlm_it2str(it->it_op), lvb_len);





		OBD_ALLOC_LARGE(lmm, lvb_len);

		lmm = libcfs_kvzalloc(lvb_len, GFP_NOFS);

		if (lmm == NULL) {

		if (lmm == NULL) {

			LDLM_LOCK_PUT(lock);

			LDLM_LOCK_PUT(lock);

			return -ENOMEM;

			return -ENOMEM;
@@ -763,7 +763,7 @@ static int mdc_finish_enqueue(struct obd_export *exp, 
		}

		}

		unlock_res_and_lock(lock);

		unlock_res_and_lock(lock);

		if (lmm != NULL)

		if (lmm != NULL)

			OBD_FREE_LARGE(lmm, lvb_len);

			kvfree(lmm);

	}

	}

	if (lock != NULL)

	if (lock != NULL)

		LDLM_LOCK_PUT(lock);

		LDLM_LOCK_PUT(lock);