From patchwork Mon Jun 13 20:42:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 876302 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 p5DKghsS026744 for ; Mon, 13 Jun 2011 20:42:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751906Ab1FMUmm (ORCPT ); Mon, 13 Jun 2011 16:42:42 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:38546 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751686Ab1FMUmm (ORCPT ); Mon, 13 Jun 2011 16:42:42 -0400 Received: by iyb14 with SMTP id 14so4143509iyb.19 for ; Mon, 13 Jun 2011 13:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer; bh=77lcVizhFqYcPoAkKVJ4K8uvUN+rtOk4hVTcduYL6vM=; b=qByUrBQtT/UgjYYlRgLXdQsK59ID4zrr4ZAA1X5UnrM9VcijGjZfklXnEtm20bBcWQ tc1YVlURUiZ+tccoAzTQaEc8edhjglb6nDd9oVu5yvLOgll8ofb1d+uVdTgzpmGok5ux JPS3xbw8mGykFOWkdZYF4iI//tEXKsN/AJIcQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer; b=v4UkL2KrVAToYfdfXEL/7izmy0/3TRBEaM1tNxkJZzol+UQTXQfoat5nUa7z4ctiza Rh0bRYBLObhc/XatopMAPCo4YY5vByk/HHhvWXvh4oDJv3C31YZieaxBep4bhQHGY52F 1NqEU8VVeUN1/x3zMYOMO3AE3jnCGh9V6Prvs= Received: by 10.42.131.137 with SMTP id z9mr6712765ics.427.1307997761793; Mon, 13 Jun 2011 13:42:41 -0700 (PDT) Received: from localhost.localdomain (dh147.citi.umich.edu [141.212.112.147]) by mx.google.com with ESMTPS id y1sm5043644ica.16.2011.06.13.13.42.41 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Jun 2011 13:42:41 -0700 (PDT) From: Benny Halevy To: linux-nfs@vger.kernel.org Subject: [PATCH] SQUASHME: pnfsd-lexp: return only nfs4errs from pnfsd_lexp_layout_get Date: Mon, 13 Jun 2011 16:42:38 -0400 Message-Id: <1307997758-21235-1-git-send-email-benny@tonian.com> X-Mailer: git-send-email 1.7.4.4 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]); Mon, 13 Jun 2011 20:42:44 +0000 (UTC) Signed-off-by: Benny Halevy --- fs/nfsd/pnfsd_lexp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/pnfsd_lexp.c b/fs/nfsd/pnfsd_lexp.c index 4d8bceb..52ab2d2 100644 --- a/fs/nfsd/pnfsd_lexp.c +++ b/fs/nfsd/pnfsd_lexp.c @@ -156,7 +156,7 @@ pnfsd_lexp_layout_get(struct inode *inode, layout = kzalloc(sizeof(*layout), GFP_KERNEL); if (layout == NULL) { - rc = -ENOMEM; + rc = NFS4ERR_DELAY; goto error; } @@ -173,7 +173,7 @@ pnfsd_lexp_layout_get(struct inode *inode, fhp = kmalloc(sizeof(*fhp), GFP_KERNEL); if (fhp == NULL) { - rc = -ENOMEM; + rc = NFS4ERR_DELAY; goto error; }