From patchwork Sun Mar 22 14:17:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6066781 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 43A4CBF90F for ; Sun, 22 Mar 2015 14:17:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E5482026F for ; Sun, 22 Mar 2015 14:17:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A60B22026D for ; Sun, 22 Mar 2015 14:17:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751776AbbCVORT (ORCPT ); Sun, 22 Mar 2015 10:17:19 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33634 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751768AbbCVORT (ORCPT ); Sun, 22 Mar 2015 10:17:19 -0400 Received: by pabxg6 with SMTP id xg6so150059373pab.0 for ; Sun, 22 Mar 2015 07:17:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=kHOlaFx2qZlPzi3CuQCDixDIK+tB06WCpbwv+uLcQqI=; b=oNXG+glR0xuSACvoxGAvAZOSeT+h61DG6Jr487MriSBtuDlctppJdzPTHlA5V3myPU yDvnPaHsZPAYb5tQEtXoWEvxpspNk91/fVSggInMFD67CscRVWyUcBTQXKpopAWrJ6eq RAWjEGd2PLmdsTPo0IHiuJZ8tOfioJJ0e7aW2P4V7oDOUR9pZQwmqPWODVpg4wrVnnK5 ABx0vyztY6alUR/MCg3Sw+s1xyVByAlA2lrQAScImkiwGktEz3K4cLDKVZr/wyRCNZQZ Jx1pPM94TI5r3NjgEPZt0g6BvccB0SUFQhcvWLn/uAJqJ2Oy7ffOlhsv5uyddXzciYIF Oq8Q== X-Received: by 10.66.233.35 with SMTP id tt3mr131748720pac.36.1427033838811; Sun, 22 Mar 2015 07:17:18 -0700 (PDT) Received: from [192.168.99.7] ([104.143.41.80]) by mx.google.com with ESMTPSA id db10sm14064130pdb.86.2015.03.22.07.17.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Mar 2015 07:17:18 -0700 (PDT) Message-ID: <550ECEE6.7090402@gmail.com> Date: Sun, 22 Mar 2015 22:17:10 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: "J. Bruce Fields" CC: Christoph Hellwig , Linux NFS Mailing List Subject: [PATCH] NFSD: Take care the return value from nfsd4_encode_stateid Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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: Kinglong Mee Reviewed-by: Christoph Hellwig --- fs/nfsd/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index dd9302c..5c0aa74 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4135,7 +4135,7 @@ nfsd4_encode_layoutreturn(struct nfsd4_compoundres *resp, __be32 nfserr, return nfserr_resource; *p++ = cpu_to_be32(lrp->lrs_present); if (lrp->lrs_present) - nfsd4_encode_stateid(xdr, &lrp->lr_sid); + return nfsd4_encode_stateid(xdr, &lrp->lr_sid); return nfs_ok; } #endif /* CONFIG_NFSD_PNFS */