From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29D5DC3A5A0 for ; Sat, 18 Apr 2020 13:53:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 00D96214AF for ; Sat, 18 Apr 2020 13:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587218000; bh=9sDGtt4AzKAVwBWf89jS6ybRmtp4c5IDIplgFw7is60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KToWXDsmpN/IyYQnaMBRwuspUDD7jBqAIuh4INUF4wLPxfrBHScB3dxEy3B9hd3XX qX0Xtgg/ydKz8xfCQa9U25/8tS5YwKG0UC6TvCtOe68kzPa3l/AAivrHvt4sFrIp6N E4+npp8xuGGpk1jbeEHuhorJiXxu45R5A4UIz/eo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726864AbgDRNxF (ORCPT ); Sat, 18 Apr 2020 09:53:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:54754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726405AbgDRNsb (ORCPT ); Sat, 18 Apr 2020 09:48:31 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B015E2220A; Sat, 18 Apr 2020 13:48:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587217711; bh=9sDGtt4AzKAVwBWf89jS6ybRmtp4c5IDIplgFw7is60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=td6gFUZV2tRq8Np7gC9LRJPjVEdkCKHmoxneKRDvkfwHzTL8KpsUhtwbAuFuptnu1 2Zx6jq4TLigN/iviWhwwiOijazKZgHsKc3Mkdr7AlbUEE33y8nMfrIETJriju8YNUt SJof1PXrEUw2Adfdso9SVRd8jM6bd5Vl1xneIUio= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiujun Huang , Jeff Layton , Ilya Dryomov , Sasha Levin , ceph-devel@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 13/73] ceph: return ceph_mdsc_do_request() errors from __get_parent() Date: Sat, 18 Apr 2020 09:47:15 -0400 Message-Id: <20200418134815.6519-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418134815.6519-1-sashal@kernel.org> References: <20200418134815.6519-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Qiujun Huang [ Upstream commit c6d50296032f0b97473eb2e274dc7cc5d0173847 ] Return the error returned by ceph_mdsc_do_request(). Otherwise, r_target_inode ends up being NULL this ends up returning ENOENT regardless of the error. Signed-off-by: Qiujun Huang Reviewed-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/export.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/ceph/export.c b/fs/ceph/export.c index b6bfa94332c30..79dc06881e78e 100644 --- a/fs/ceph/export.c +++ b/fs/ceph/export.c @@ -315,6 +315,11 @@ static struct dentry *__get_parent(struct super_block *sb, req->r_num_caps = 1; err = ceph_mdsc_do_request(mdsc, NULL, req); + if (err) { + ceph_mdsc_put_request(req); + return ERR_PTR(err); + } + inode = req->r_target_inode; if (inode) ihold(inode); -- 2.20.1