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

Commit ad8100e0 authored by Kurt Hackel's avatar Kurt Hackel Committed by Mark Fasheh
Browse files

ocfs2: use GFP_NOFS in some dlm operations 



Signed-off-by: default avatarKurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent b7084ab5

fs/ocfs2/dlm/dlmfs.c

+3 −3
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int dlmfs_file_open(struct inode *inode, 
	 * doesn't make sense for LVB writes. */

	file->f_flags &= ~O_APPEND;



	fp = kmalloc(sizeof(*fp), GFP_KERNEL);

	fp = kmalloc(sizeof(*fp), GFP_NOFS);

	if (!fp) {

		status = -ENOMEM;

		goto bail;
@@ -196,7 +196,7 @@ static ssize_t dlmfs_file_read(struct file *filp, 
	else

		readlen = count - *ppos;



	lvb_buf = kmalloc(readlen, GFP_KERNEL);

	lvb_buf = kmalloc(readlen, GFP_NOFS);

	if (!lvb_buf)

		return -ENOMEM;
@@ -240,7 +240,7 @@ static ssize_t dlmfs_file_write(struct file *filp, 
	else

		writelen = count - *ppos;



	lvb_buf = kmalloc(writelen, GFP_KERNEL);

	lvb_buf = kmalloc(writelen, GFP_NOFS);

	if (!lvb_buf)

		return -ENOMEM;

fs/ocfs2/dlm/dlmlock.c

+2 −2
Original line number Diff line number Diff line
@@ -408,13 +408,13 @@ struct dlm_lock * dlm_new_lock(int type, u8 node, u64 cookie, 
	struct dlm_lock *lock;

	int kernel_allocated = 0;



	lock = kcalloc(1, sizeof(*lock), GFP_KERNEL);

	lock = kcalloc(1, sizeof(*lock), GFP_NOFS);

	if (!lock)

		return NULL;



	if (!lksb) {

		/* zero memory only if kernel-allocated */

		lksb = kcalloc(1, sizeof(*lksb), GFP_KERNEL);

		lksb = kcalloc(1, sizeof(*lksb), GFP_NOFS);

		if (!lksb) {

			kfree(lock);

			return NULL;

fs/ocfs2/dlm/dlmmaster.c

+8 −8
Original line number Diff line number Diff line
@@ -709,11 +709,11 @@ struct dlm_lock_resource *dlm_new_lockres(struct dlm_ctxt *dlm, 
{

	struct dlm_lock_resource *res;



	res = kmalloc(sizeof(struct dlm_lock_resource), GFP_KERNEL);

	res = kmalloc(sizeof(struct dlm_lock_resource), GFP_NOFS);

	if (!res)

		return NULL;



	res->lockname.name = kmalloc(namelen, GFP_KERNEL);

	res->lockname.name = kmalloc(namelen, GFP_NOFS);

	if (!res->lockname.name) {

		kfree(res);

		return NULL;
@@ -777,7 +777,7 @@ lookup: 
		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_KERNEL);

			kmem_cache_alloc(dlm_mle_cache, GFP_NOFS);

		if (!alloc_mle)

			goto leave;

		res = dlm_new_lockres(dlm, lockid, namelen);
@@ -1532,7 +1532,7 @@ way_up_top: 
			spin_unlock(&dlm->spinlock);



			mle = (struct dlm_master_list_entry *)

				kmem_cache_alloc(dlm_mle_cache, GFP_KERNEL);

				kmem_cache_alloc(dlm_mle_cache, GFP_NOFS);

			if (!mle) {

				response = DLM_MASTER_RESP_ERROR;

				mlog_errno(-ENOMEM);
@@ -1940,7 +1940,7 @@ int dlm_dispatch_assert_master(struct dlm_ctxt *dlm, 
			       int ignore_higher, u8 request_from, u32 flags)

{

	struct dlm_work_item *item;

	item = kcalloc(1, sizeof(*item), GFP_KERNEL);

	item = kcalloc(1, sizeof(*item), GFP_NOFS);

	if (!item)

		return -ENOMEM;
@@ -2175,14 +2175,14 @@ int dlm_migrate_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, 
	 */



	ret = -ENOMEM;

	mres = (struct dlm_migratable_lockres *) __get_free_page(GFP_KERNEL);

	mres = (struct dlm_migratable_lockres *) __get_free_page(GFP_NOFS);

	if (!mres) {

		mlog_errno(ret);

		goto leave;

	}



	mle = (struct dlm_master_list_entry *) kmem_cache_alloc(dlm_mle_cache,

								GFP_KERNEL);

								GFP_NOFS);

	if (!mle) {

		mlog_errno(ret);

		goto leave;
@@ -2639,7 +2639,7 @@ int dlm_migrate_request_handler(struct o2net_msg *msg, u32 len, void *data) 


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

	mle = (struct dlm_master_list_entry *) kmem_cache_alloc(dlm_mle_cache,

							 GFP_KERNEL);

							 GFP_NOFS);



	if (!mle) {

		ret = -ENOMEM;

fs/ocfs2/dlm/dlmrecovery.c

+5 −5
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 dead_node) 
		}

		BUG_ON(num == dead_node);



		ndata = kcalloc(1, sizeof(*ndata), GFP_KERNEL);

		ndata = kcalloc(1, sizeof(*ndata), GFP_NOFS);

		if (!ndata) {

			dlm_destroy_recovery_area(dlm, dead_node);

			return -ENOMEM;
@@ -822,14 +822,14 @@ int dlm_request_all_locks_handler(struct o2net_msg *msg, u32 len, void *data) 
	}

	BUG_ON(lr->dead_node != dlm->reco.dead_node);



	item = kcalloc(1, sizeof(*item), GFP_KERNEL);

	item = kcalloc(1, sizeof(*item), GFP_NOFS);

	if (!item) {

		dlm_put(dlm);

		return -ENOMEM;

	}



	/* this will get freed by dlm_request_all_locks_worker */

	buf = (char *) __get_free_page(GFP_KERNEL);

	buf = (char *) __get_free_page(GFP_NOFS);

	if (!buf) {

		kfree(item);

		dlm_put(dlm);
@@ -1302,8 +1302,8 @@ int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data) 
		mlog(0, "all done flag.  all lockres data received!\n");



	ret = -ENOMEM;

	buf = kmalloc(be16_to_cpu(msg->data_len), GFP_KERNEL);

	item = kcalloc(1, sizeof(*item), GFP_KERNEL);

	buf = kmalloc(be16_to_cpu(msg->data_len), GFP_NOFS);

	item = kcalloc(1, sizeof(*item), GFP_NOFS);

	if (!buf || !item)

		goto leave;

fs/ocfs2/dlm/userdlm.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ struct dlm_ctxt *user_dlm_register_context(struct qstr *name) 
	u32 dlm_key;

	char *domain;



	domain = kmalloc(name->len + 1, GFP_KERNEL);

	domain = kmalloc(name->len + 1, GFP_NOFS);

	if (!domain) {

		mlog_errno(-ENOMEM);

		return ERR_PTR(-ENOMEM);