From patchwork Thu Sep 17 12:28:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7206301 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EEFB09F336 for ; Thu, 17 Sep 2015 12:28:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 195D920809 for ; Thu, 17 Sep 2015 12:28:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63885207F5 for ; Thu, 17 Sep 2015 12:28:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751421AbbIQM2s (ORCPT ); Thu, 17 Sep 2015 08:28:48 -0400 Received: from mail-yk0-f174.google.com ([209.85.160.174]:36329 "EHLO mail-yk0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbbIQM2r (ORCPT ); Thu, 17 Sep 2015 08:28:47 -0400 Received: by ykdt18 with SMTP id t18so14795304ykd.3 for ; Thu, 17 Sep 2015 05:28:47 -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:cc:subject:date:message-id; bh=CdXCFR35cJ+qGgi6swoGisDyy6i3SUofryl2Zf3LMOs=; b=GzeacEB3Le0/ZqE1YHXgDTHwpbpBasPRYmmte+ZeXs6pH98zc7nk08kPfFy+Pw1sYW Ely47/GQk/BeFqxCz9MOekn/1iJ/sdHmVfs54VsyxftZ8317tVT67USA8ZekzFjoOBjP l1I9rD4VSDby55jFox5hLUuClBBN0lY5uVYjYbHBT50zdtycm07irVABV3UPNmcDDiBu Uspz3zE7lGmDuF6d8O3w1GPv2D2YC/oBilfyfCxcN9gaqBBoxvBLjXfgddhiPeZWyZVQ 0pv+QjiW0Ch3wyNJJ7kFe5qaanrnRwoXY5mpWoEMcdH4lPquor/hhK/ohD9kyvPrfcn+ rPvA== X-Gm-Message-State: ALoCoQm86pbAP4lV2ChbpscZ9oNLt8OBMKLChW4bX6xDkxW0sLjJZmby0at0MIAyE4/aDd9KVs8f X-Received: by 10.13.252.6 with SMTP id m6mr32751492ywf.60.1442492926994; Thu, 17 Sep 2015 05:28:46 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1105:8e:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id m124sm1875584ywb.4.2015.09.17.05.28.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2015 05:28:45 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Andreas Dilger Subject: [PATCH 1/2] nfsd: move svc_fh->fh_maxsize to just after fh_handle Date: Thu, 17 Sep 2015 08:28:38 -0400 Message-Id: <1442492919-31842-1-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This moves the hole in the struct down below the flags fields, which allows us to potentially add a new flag without growing the struct. Signed-off-by: Jeff Layton --- fs/nfsd/nfsfh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h index 1e90dad4926b..b1edd6bf40e1 100644 --- a/fs/nfsd/nfsfh.h +++ b/fs/nfsd/nfsfh.h @@ -26,9 +26,9 @@ static inline ino_t u32_to_ino_t(__u32 uino) */ typedef struct svc_fh { struct knfsd_fh fh_handle; /* FH data */ + int fh_maxsize; /* max size for fh_handle */ struct dentry * fh_dentry; /* validated dentry */ struct svc_export * fh_export; /* export pointer */ - int fh_maxsize; /* max size for fh_handle */ unsigned char fh_locked; /* inode locked by us */ unsigned char fh_want_write; /* remount protection taken */