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

Commit de51919c authored by Niu Yawei's avatar Niu Yawei Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: check reply status in ll_migrate() 



ll_migrate() should check reply status before trying to read
reply buffer, checking if request is NULL doesn't make sense.

Signed-off-by: default avatarNiu Yawei <yawei.niu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8807
Reviewed-on: https://review.whamcloud.com/23666


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarLai Siyao <lai.siyao@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aa2f4a3f

drivers/staging/lustre/lustre/llite/file.c

+9 −9
Original line number Diff line number Diff line
@@ -2664,15 +2664,12 @@ int ll_migrate(struct inode *parent, struct file *file, int mdtidx, 
	op_data->op_cli_flags = CLI_MIGRATE;

	rc = md_rename(ll_i2sbi(parent)->ll_md_exp, op_data, name,

		       namelen, name, namelen, &request);

	if (!rc)

	if (!rc) {

		LASSERT(request);

		ll_update_times(request, parent);



	if (request) {

		body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY);

		if (!body) {

			rc = -EPROTO;

			goto out_close;

		}

		LASSERT(body);



		/*

		 * If the server does release layout lock, then we cleanup
@@ -2686,14 +2683,17 @@ int ll_migrate(struct inode *parent, struct file *file, int mdtidx, 
			kfree(och);

			och = NULL;

		}

	}



	if (request) {

		ptlrpc_req_finished(request);

		request = NULL;

	}



	/* Try again if the file layout has changed. */

	if (rc == -EAGAIN && S_ISREG(child_inode->i_mode)) {

		request = NULL;

	if (rc == -EAGAIN && S_ISREG(child_inode->i_mode))

		goto again;

	}



out_close:

	if (och) /* close the file */

		ll_lease_close(och, child_inode, NULL);