From patchwork Wed Jun 15 18:32:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fred Isaman X-Patchwork-Id: 883062 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5FIVvCZ031941 for ; Wed, 15 Jun 2011 18:32:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752248Ab1FOScG (ORCPT ); Wed, 15 Jun 2011 14:32:06 -0400 Received: from mx2.netapp.com ([216.240.18.37]:15866 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751779Ab1FOScF (ORCPT ); Wed, 15 Jun 2011 14:32:05 -0400 X-IronPort-AV: E=Sophos;i="4.65,370,1304319600"; d="scan'208";a="555848801" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 15 Jun 2011 11:32:04 -0700 Received: from localhost.localdomain (povey-lxp.hq.netapp.com [10.55.65.195] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p5FIW31A021491; Wed, 15 Jun 2011 11:32:04 -0700 (PDT) From: Fred Isaman To: linux-nfs@vger.kernel.org Cc: Trond Myklebust , Fred Isaman Subject: [PATCH 1/1] nfs4.1: mark layout as bad on error path in _pnfs_return_layout Date: Wed, 15 Jun 2011 14:32:02 -0400 Message-Id: <1308162722-16248-1-git-send-email-iisaman@netapp.com> X-Mailer: git-send-email 1.7.2.1 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 15 Jun 2011 18:32:07 +0000 (UTC) Signed-off-by: Fred Isaman --- fs/nfs/pnfs.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index ebac718..dec239f 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -658,6 +658,8 @@ _pnfs_return_layout(struct inode *ino) lrp = kzalloc(sizeof(*lrp), GFP_KERNEL); if (unlikely(lrp == NULL)) { status = -ENOMEM; + set_bit(NFS_LAYOUT_RW_FAILED, &lo->plh_flags); + set_bit(NFS_LAYOUT_RO_FAILED, &lo->plh_flags); put_layout_hdr(lo); goto out; }