Commit 4fb547be authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.2/copyoffload: Convert GFP_NOFS to GFP_KERNEL 



There doesn't seem to be any reason why the copy offload code can't use
GFP_KERNEL. It can't get called by direct reclaim.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 61345a42

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ __be32 nfs4_callback_offload(void *data, void *dummy, 
	struct nfs4_copy_state *copy, *tmp_copy;

	bool found = false;



	copy = kzalloc(sizeof(struct nfs4_copy_state), GFP_NOFS);

	copy = kzalloc(sizeof(struct nfs4_copy_state), GFP_KERNEL);

	if (!copy)

		return htonl(NFS4ERR_SERVERFAULT);

fs/nfs/nfs42proc.c

+5 −5
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int handle_async_copy(struct nfs42_copy_res *res, 
	struct nfs_open_context *dst_ctx = nfs_file_open_context(dst);

	struct nfs_open_context *src_ctx = nfs_file_open_context(src);



	copy = kzalloc(sizeof(struct nfs4_copy_state), GFP_NOFS);

	copy = kzalloc(sizeof(struct nfs4_copy_state), GFP_KERNEL);

	if (!copy)

		return -ENOMEM;
@@ -254,7 +254,7 @@ static int process_copy_commit(struct file *dst, loff_t pos_dst, 
	struct nfs_commitres cres;

	int status = -ENOMEM;



	cres.verf = kzalloc(sizeof(struct nfs_writeverf), GFP_NOFS);

	cres.verf = kzalloc(sizeof(struct nfs_writeverf), GFP_KERNEL);

	if (!cres.verf)

		goto out;
@@ -357,7 +357,7 @@ static ssize_t _nfs42_proc_copy(struct file *src, 
	res->commit_res.verf = NULL;

	if (args->sync) {

		res->commit_res.verf =

			kzalloc(sizeof(struct nfs_writeverf), GFP_NOFS);

			kzalloc(sizeof(struct nfs_writeverf), GFP_KERNEL);

		if (!res->commit_res.verf)

			return -ENOMEM;

	}
@@ -552,7 +552,7 @@ static int nfs42_do_offload_cancel_async(struct file *dst, 
	if (!(dst_server->caps & NFS_CAP_OFFLOAD_CANCEL))

		return -EOPNOTSUPP;



	data = kzalloc(sizeof(struct nfs42_offloadcancel_data), GFP_NOFS);

	data = kzalloc(sizeof(struct nfs42_offloadcancel_data), GFP_KERNEL);

	if (data == NULL)

		return -ENOMEM;
@@ -629,7 +629,7 @@ int nfs42_proc_copy_notify(struct file *src, struct file *dst, 
	if (!(src_server->caps & NFS_CAP_COPY_NOTIFY))

		return -EOPNOTSUPP;



	args = kzalloc(sizeof(struct nfs42_copy_notify_args), GFP_NOFS);

	args = kzalloc(sizeof(struct nfs42_copy_notify_args), GFP_KERNEL);

	if (args == NULL)

		return -ENOMEM;

fs/nfs/nfs4file.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static ssize_t __nfs4_copy_file_range(struct file *file_in, loff_t pos_in, 
		if (sync)

			return -EOPNOTSUPP;

		cn_resp = kzalloc(sizeof(struct nfs42_copy_notify_res),

				GFP_NOFS);

				  GFP_KERNEL);

		if (unlikely(cn_resp == NULL))

			return -ENOMEM;
@@ -339,7 +339,7 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt, 


	res = ERR_PTR(-ENOMEM);

	len = strlen(SSC_READ_NAME_BODY) + 16;

	read_name = kzalloc(len, GFP_NOFS);

	read_name = kzalloc(len, GFP_KERNEL);

	if (read_name == NULL)

		goto out;

	snprintf(read_name, len, SSC_READ_NAME_BODY, read_name_gen++);