From de51919c9a0297345d520de0ec2baee4bf5ddc87 Mon Sep 17 00:00:00 2001 From: Niu Yawei Date: Sat, 11 Feb 2017 12:12:39 -0500 Subject: [PATCH] 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: Niu Yawei Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8807 Reviewed-on: https://review.whamcloud.com/23666 Reviewed-by: Andreas Dilger Reviewed-by: Lai Siyao Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin Signed-off-by: James Simmons Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/llite/file.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c index 271608df9158..10adfcdd7035 100644 --- a/drivers/staging/lustre/lustre/llite/file.c +++ b/drivers/staging/lustre/lustre/llite/file.c @@ -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); - } - /* Try again if the file layout has changed. */ - if (rc == -EAGAIN && S_ISREG(child_inode->i_mode)) { request = NULL; - goto again; } + + /* Try again if the file layout has changed. */ + 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);