From patchwork Tue Apr 1 12:43:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 3922191 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BD26CBF549 for ; Tue, 1 Apr 2014 12:43:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B8CF20213 for ; Tue, 1 Apr 2014 12:43:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F1E420154 for ; Tue, 1 Apr 2014 12:43:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751320AbaDAMnM (ORCPT ); Tue, 1 Apr 2014 08:43:12 -0400 Received: from mga09.intel.com ([134.134.136.24]:19264 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751222AbaDAMnJ (ORCPT ); Tue, 1 Apr 2014 08:43:09 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 01 Apr 2014 05:38:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,772,1389772800"; d="scan'208";a="484767540" Received: from unknown (HELO zyan5-mobl.ccr.corp.intel.com) ([10.255.20.39]) by orsmga001.jf.intel.com with ESMTP; 01 Apr 2014 05:43:07 -0700 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org Cc: "Yan, Zheng" Subject: [PATCH 2/3] ceph: don't grabs open file reference for aborted request Date: Tue, 1 Apr 2014 20:43:03 +0800 Message-Id: <1396356184-4317-2-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1396356184-4317-1-git-send-email-zheng.z.yan@intel.com> References: <1396356184-4317-1-git-send-email-zheng.z.yan@intel.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Yan, Zheng --- fs/ceph/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index c9f2567..0b0728e 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1112,7 +1112,7 @@ retry_lookup: err = fill_inode(in, &rinfo->targeti, NULL, session, req->r_request_started, - (le32_to_cpu(rinfo->head->result) == 0) ? + (!req->r_aborted && rinfo->head->result == 0) ? req->r_fmode : -1, &req->r_caps_reservation); if (err < 0) {