From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750971AbdA3LhO (ORCPT ); Mon, 30 Jan 2017 06:37:14 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:28539 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053AbdA3LhD (ORCPT ); Mon, 30 Jan 2017 06:37:03 -0500 Date: Mon, 30 Jan 2017 14:34:23 +0300 From: Dan Carpenter To: James Simmons Cc: Greg Kroah-Hartman , devel@driverdev.osuosl.org, Andreas Dilger , Oleg Drokin , wang di , Linux Kernel Mailing List , Lustre Development List Subject: Re: [PATCH 05/60] staging: lustre: llite: check request != NULL in ll_migrate Message-ID: <20170130113423.GB6881@mwanda> References: <1485648328-2141-1-git-send-email-jsimmons@infradead.org> <1485648328-2141-6-git-send-email-jsimmons@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1485648328-2141-6-git-send-email-jsimmons@infradead.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jan 28, 2017 at 07:04:33PM -0500, James Simmons wrote: > From: wang di > > Check if the request is NULL, before retrieve reply body > from the request. > > Signed-off-by: wang di > Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7396 > Reviewed-on: http://review.whamcloud.com/17079 > Reviewed-by: John L. Hammond > Reviewed-by: Andreas Dilger > Signed-off-by: James Simmons > --- > drivers/staging/lustre/lustre/llite/file.c | 41 +++++++++++++++++------------- > 1 file changed, 23 insertions(+), 18 deletions(-) > > diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c > index a1e51a5..b681e15 100644 > --- a/drivers/staging/lustre/lustre/llite/file.c > +++ b/drivers/staging/lustre/lustre/llite/file.c > @@ -2656,28 +2656,33 @@ int ll_migrate(struct inode *parent, struct file *file, int mdtidx, > if (!rc) > ll_update_times(request, parent); > I don't like how we return a non-NULL request on many error paths. It would be simpler to understand if mdc_rename() freed request on error. So mdc_reint() fails but we still continue? I don't understand that but there are no comments about it. > - body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY); > - if (!body) { > - rc = -EPROTO; > - goto out_free; > - } > + if (request) { > + body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY); > + if (!body) { > + rc = -EPROTO; > + goto out_free; We should call ptlrpc_req_finished(request) before returning on this path. regards, dan carpenter