From patchwork Sat May 11 02:43:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2553011 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 70FB0DF2A2 for ; Sat, 11 May 2013 02:43:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756936Ab3EKCnU (ORCPT ); Fri, 10 May 2013 22:43:20 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:65513 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754407Ab3EKCnU (ORCPT ); Fri, 10 May 2013 22:43:20 -0400 Received: by mail-wi0-f180.google.com with SMTP id h11so1206034wiv.13 for ; Fri, 10 May 2013 19:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=TH0chNMtssq2a2M/c9kl2V1SVaB2J2l1Od823WLasKM=; b=CBpLrVvZmwKsCz2yIU/6hIZBw67rtCleOjY/ktuLCZAfZq/fFvmiLzBj6m/TgjXnSh Ip9dRDLmB4S2ZuuxSlDCjs1mECdkNILQnDr6oMPYpOrx0MCcIxcEc0xMxkuFbWHPg/xT yCh23B1HOwN5piUhyEhJjfN/s678ygtzSLH0rvGvOJiEOFTNzwAgtfaD+svCp3PY+31h NuSsq6KWn2ODSj5AHChCmaK/kfEbXi6Hvct7IMLxQHcj11/Qg6s1hKf+T3vaZj3PgcFR 5psQsoTGNy5x2NAABQaqBaS6vkheKMKLlSQNIrNG0AWhqTtKMr7zRG/Yd4wL0Fdsdj8K Treg== X-Received: by 10.180.88.231 with SMTP id bj7mr7219972wib.5.1368240199210; Fri, 10 May 2013 19:43:19 -0700 (PDT) Received: from bhalevy-lt.il.tonian.com (bzq-79-180-144-28.red.bezeqint.net. [79.180.144.28]) by mx.google.com with ESMTPSA id ge7sm1365141wib.6.2013.05.10.19.43.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 19:43:18 -0700 (PDT) From: Benny Halevy To: linux-nfs@vger.kernel.org Subject: [PATCH 12/38] Revert "pnfsd: decode getdeviceinfo notify types." Date: Sat, 11 May 2013 05:43:14 +0300 Message-Id: <1368240194-32187-1-git-send-email-bhalevy@tonian.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <518B6377.3000207@tonian.com> References: <518B6377.3000207@tonian.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org This reverts commit 367bfe8e26e0753cad8eb6855f4254f803720c9c. --- fs/nfsd/nfs4xdr.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index a552202..596a2a5 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1474,12 +1474,8 @@ static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp, str READ32(gdev->gd_layout_type); READ32(gdev->gd_maxcount); READ32(num); - if (num) { - READ_BUF(4); - READ32(gdev->gd_notify_types); - } else { - gdev->gd_notify_types = 0; - } + if (num) + READ_BUF(4); /* TODO: for now, just skip notify_types */ DECODE_TAIL; }