From patchwork Fri Aug 28 00:45:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 7089091 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 456C2BEEC1 for ; Fri, 28 Aug 2015 00:45:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E7EF207B2 for ; Fri, 28 Aug 2015 00:45:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 854E3207B8 for ; Fri, 28 Aug 2015 00:45:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752010AbbH1Apv (ORCPT ); Thu, 27 Aug 2015 20:45:51 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:34679 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006AbbH1Apu (ORCPT ); Thu, 27 Aug 2015 20:45:50 -0400 Received: by igui7 with SMTP id i7so7122770igu.1 for ; Thu, 27 Aug 2015 17:45:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=RDfeXPWapqinVJyUVxutOFIX/sjRWDMjJrNV71gZgyw=; b=M4cVMh6Sv/d9JYhG4GJRVUo8GV4jhyRSSgUFQAVyofCdj/rNF6pA1ZzvG2CkQFxKhA 54DhkM4A/Q/5aUTPVEWTzCtB+oiWQTDO0WApRbeuHIzdA/MiYU08PhZspk3LyyU3fAvZ vJTtUA4ZE0FcoLqUyLwQCz47gO9xLDYN/3H+HszP/lnV5xq01/Xub3nYElccI0QnzCk6 tWRCFECkynE8G6lJnctNMYMS+nE2ocfsVZFMo4HcNuGdI7it+hO6uFPMCKME5zwGDPb2 Pmog6QBtSVI0TZ85Cwh7VjU/gJkpDpcVJ/FISUsVmWGvH+1rIUEh3v18ANFyiuBS6TjG u9Mg== X-Gm-Message-State: ALoCoQmMAswkH/99N7jgpzYcTwuXTfY/SMUe1Vh3yWPvqFDXfz/Xx4yYIhfywb4yatPWJII+rwcm X-Received: by 10.50.59.242 with SMTP id c18mr1303268igr.66.1440722749969; Thu, 27 Aug 2015 17:45:49 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-164-203.hsd1.mi.comcast.net. [68.49.164.203]) by smtp.gmail.com with ESMTPSA id f16sm681702igt.5.2015.08.27.17.45.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2015 17:45:49 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] NFSv4.1/pnfs: Ensure layoutreturn reserves space for the opaque payload Date: Thu, 27 Aug 2015 20:45:47 -0400 Message-Id: <1440722747-124599-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1440722747-124599-1-git-send-email-trond.myklebust@primarydata.com> References: <1440722747-124599-1-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 The "FIXME" is outdated. Flexfiles does add a payload. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4xdr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index a7be571c1666..ff4784c54e04 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -400,7 +400,8 @@ static int nfs4_stat_to_errno(int); #define decode_layoutcommit_maxsz (op_decode_hdr_maxsz + 3) #define encode_layoutreturn_maxsz (8 + op_encode_hdr_maxsz + \ encode_stateid_maxsz + \ - 1 /* FIXME: opaque lrf_body always empty at the moment */) + 1 + \ + XDR_QUADLEN(NFS4_OPAQUE_LIMIT)) #define decode_layoutreturn_maxsz (op_decode_hdr_maxsz + \ 1 + decode_stateid_maxsz) #define encode_secinfo_no_name_maxsz (op_encode_hdr_maxsz + 1)