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

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

lustre: lmv: 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 e958f49b

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+6 −6
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp, 
				reqlen = offsetof(typeof(*hur),

						  hur_user_item[nr])

					 + hur->hur_request.hr_data_len;

				OBD_ALLOC_LARGE(req, reqlen);

				req = libcfs_kvzalloc(reqlen, GFP_NOFS);

				if (req == NULL)

					return -ENOMEM;
@@ -1055,7 +1055,7 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp, 
						    reqlen, req, uarg);

				if (rc1 != 0 && rc == 0)

					rc = rc1;

				OBD_FREE_LARGE(req, reqlen);

				kvfree(req);

			}

		}

		break;
@@ -2400,13 +2400,13 @@ static int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp, 
		return mea_size;



	if (*lmmp && !lsm) {

		OBD_FREE_LARGE(*lmmp, mea_size);

		kvfree(*lmmp);

		*lmmp = NULL;

		return 0;

	}



	if (*lmmp == NULL) {

		OBD_ALLOC_LARGE(*lmmp, mea_size);

		*lmmp = libcfs_kvzalloc(mea_size, GFP_NOFS);

		if (*lmmp == NULL)

			return -ENOMEM;

	}
@@ -2449,14 +2449,14 @@ static int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp, 
		return mea_size;



	if (*lsmp != NULL && lmm == NULL) {

		OBD_FREE_LARGE(*tmea, mea_size);

		kvfree(*tmea);

		*lsmp = NULL;

		return 0;

	}



	LASSERT(mea_size == lmm_size);



	OBD_ALLOC_LARGE(*tmea, mea_size);

	*tmea = libcfs_kvzalloc(mea_size, GFP_NOFS);

	if (*tmea == NULL)

		return -ENOMEM;