From patchwork Mon Jul 7 14:13:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 4494961 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 270B5BEEAA for ; Mon, 7 Jul 2014 14:14:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B66220212 for ; Mon, 7 Jul 2014 14:14:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A003F201EC for ; Mon, 7 Jul 2014 14:13:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753373AbaGGON6 (ORCPT ); Mon, 7 Jul 2014 10:13:58 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:47637 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753219AbaGGON6 (ORCPT ); Mon, 7 Jul 2014 10:13:58 -0400 Received: by mail-pd0-f180.google.com with SMTP id fp1so5359834pdb.25 for ; Mon, 07 Jul 2014 07:13:57 -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=JBgAPF4bIzv5FqRwQ2yLjh++Iv1zilu0AFHeTvTJR1w=; b=I30MbKH6Z/inf8QElxAVb2xp9jKnvrITiBR4kaHSYYecZ5n2UWswto7SRB91rrpTDA q6TjPlFHj1o5XgrhMLdMsdMzSl5+KbOOmWv3Cnbx5Q2o2F9k/QW2nUhbKtn9caPqrzKl sr03HEvlGsn1oytIpPHZ4mqWRCmBYmR+tDEa7FCuZG9WfjcQa1ZLMc9jKjTSNh1ItP1l h6rnOvQ1Mu7tRX5QkntRi41tdZm/VJaR05BWLDUkRT2K3Tyw7reR05MiwinsmvoSWLob Eumlw9SAFWYOio6Rug11VzO1at5SIwDRKgETkg1r8NAX978euJkFbagE1c2fWq5jfGgQ yMMg== X-Received: by 10.68.164.4 with SMTP id ym4mr29207274pbb.53.1404742437696; Mon, 07 Jul 2014 07:13:57 -0700 (PDT) Received: from [192.168.0.100] ([118.117.112.198]) by mx.google.com with ESMTPSA id qk9sm191651317pac.16.2014.07.07.07.13.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Jul 2014 07:13:56 -0700 (PDT) Message-ID: <53BAAAFE.8090403@gmail.com> Date: Mon, 07 Jul 2014 22:13:18 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: "J. Bruce Fields" CC: Linux NFS Mailing List , kinglongmee@gmail.com Subject: [PATCH 3/4 RFC] NFSD: Revert setting op_encode_lockowner_maxsz Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Commit 8c7424cff6 (nfsd4: don't try to encode conflicting owner if low on space) set op_encode_lockowner_maxsz to zero. When testing nfsd4_lock with conflict lock (has right owner), dmesg gets "[18668.241385] RPC request reserved 88 but used 108" because xdr_reserve_space don't return NULL in nfsd4_encode_lock_denied. Just revert op_encode_lockowner_maxsz. Signed-off-by: Kinglong Mee --- fs/nfsd/nfs4proc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 846fd55..6217190 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1422,8 +1422,7 @@ out: #define op_encode_change_info_maxsz (5) #define nfs4_fattr_bitmap_maxsz (4) -/* We'll fall back on returning no lockowner if run out of space: */ -#define op_encode_lockowner_maxsz (0) +#define op_encode_lockowner_maxsz (1 + XDR_QUADLEN(IDMAP_NAMESZ)) #define op_encode_lock_denied_maxsz (8 + op_encode_lockowner_maxsz) #define nfs4_owner_maxsz (1 + XDR_QUADLEN(IDMAP_NAMESZ))