From patchwork Sat May 11 02:42:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2552901 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 B1994DF2A2 for ; Sat, 11 May 2013 02:42:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756664Ab3EKCmf (ORCPT ); Fri, 10 May 2013 22:42:35 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:54500 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754337Ab3EKCmf (ORCPT ); Fri, 10 May 2013 22:42:35 -0400 Received: by mail-wg0-f43.google.com with SMTP id c11so4502669wgh.34 for ; Fri, 10 May 2013 19:42:33 -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=Bh97nIRDzgrROq22F8ZzQY3xExl6r6a+L3nkEICqRPE=; b=fqh3rcYEc5hsx8O4a9+8SRy6rbBFz6mFwBgOpi5fK3SqFcqYIt/afoXha66XNZYCUm sg2p+DwJbvtlvtWBe7nf2scBLkAXKrzfv8GAYFnsDwadp0qv0WrccqUwDzKeqWb1aSLF kFn3V6Hek7ixVAIz07dn0PYYdUi7BnUhaUGZz2JBCCfmDnB/ZTJXFSZ5Ye7rqw8fRmNc OdSGHKAQ+IJzw8zQjgGWEtZrcnxkbemD/5bmCC9TMywldh40NbxTfSJ1ixToEY5CoLdT qfyPvL5bp//n5SVbkJN0A9F3JIJ07giI4Qn9C1qhe3mFbEKHjUk6Ff+aq5M2IZv1a+83 jScw== X-Received: by 10.180.21.242 with SMTP id y18mr7185965wie.7.1368240153852; Fri, 10 May 2013 19:42:33 -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 a4sm1374045wic.5.2013.05.10.19.42.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 19:42:33 -0700 (PDT) From: Benny Halevy To: linux-nfs@vger.kernel.org Subject: [PATCH 01/38] Revert "SQUASHME: pnfsd: Fix compiler warning when CONFIG_SUNRPC_DEBUG is not set" Date: Sat, 11 May 2013 05:42:26 +0300 Message-Id: <1368240146-31751-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 93275cbb789cd18eda5f9fa91469fb9c28ed8896. --- fs/nfsd/nfs4pnfsds.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4pnfsds.c b/fs/nfsd/nfs4pnfsds.c index ab67523..2732f20 100644 --- a/fs/nfsd/nfs4pnfsds.c +++ b/fs/nfsd/nfs4pnfsds.c @@ -170,9 +170,10 @@ static int stateid_hashval(stateid_t *stidp) hashval = stateid_hashval(stidp); list_for_each_entry(local, &ds_stid_hashtbl[hashval], ds_hash) if (!memcmp(&local->ds_stid.si_opaque, &stidp->si_opaque, sizeof(stidp->si_opaque))) { + stateid_t *sid = &local->ds_stid; dprintk("NFSD: %s <-- %p ds_flags %lx " STATEID_FMT "\n", __func__, local, local->ds_flags, - STATEID_VAL(&local->ds_stid)); + STATEID_VAL(sid)); return local; } return NULL;