From patchwork Fri Dec 21 20:05:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 1904671 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 59BD83FE37 for ; Fri, 21 Dec 2012 20:11:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751060Ab2LUULG (ORCPT ); Fri, 21 Dec 2012 15:11:06 -0500 Received: from 183.141.211.66.inaddr.G4.NET ([66.211.141.183]:50516 "EHLO Dobby.4dicksons.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750800Ab2LUULF (ORCPT ); Fri, 21 Dec 2012 15:11:05 -0500 Received: from tophat.home.4dicksons.org ([192.168.62.20]) by Dobby.4dicksons.org with esmtp (Exim 4.63) (envelope-from ) id 1Tm8vu-0001ms-5m; Fri, 21 Dec 2012 15:11:02 -0500 From: Steve Dickson To: David Quigley Cc: Linux NFS Mailing List Subject: [PATCH] lnfs: remove export flag for label NFS exports Date: Fri, 21 Dec 2012 15:05:50 -0500 Message-Id: <1356120350-6325-1-git-send-email-steved@redhat.com> X-Mailer: git-send-email 1.7.11.7 X-Spam-Score: -2.9 (--) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org It was deemed through code review, that having an "security_label" export flag was not needed. Signed-off-by: Steve Dickson --- fs/nfsd/export.c | 3 --- fs/nfsd/nfs4xdr.c | 5 +---- include/uapi/linux/nfsd/export.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 251eca7..a3946cf 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -1112,9 +1112,6 @@ static struct flags { { NFSEXP_ASYNC, {"async", "sync"}}, { NFSEXP_GATHERED_WRITES, {"wdelay", "no_wdelay"}}, { NFSEXP_NOHIDE, {"nohide", ""}}, -#ifdef CONFIG_NFSD_V4_SECURITY_LABEL - { NFSEXP_SECURITY_LABEL, {"security_label", ""}}, -#endif { NFSEXP_CROSSMOUNT, {"crossmnt", ""}}, { NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}}, { NFSEXP_NOAUTHNLM, {"insecure_locks", ""}}, diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 58e205c..a234ed4 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2214,10 +2214,7 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, if (!aclsupport) word0 &= ~FATTR4_WORD0_ACL; #ifdef CONFIG_NFSD_V4_SECURITY_LABEL - if (exp->ex_flags & NFSEXP_SECURITY_LABEL) - word2 |= FATTR4_WORD2_SECURITY_LABEL; - else - word2 &= ~FATTR4_WORD2_SECURITY_LABEL; + word2 |= FATTR4_WORD2_SECURITY_LABEL; #else word2 &= ~FATTR4_WORD2_SECURITY_LABEL; #endif diff --git a/include/uapi/linux/nfsd/export.h b/include/uapi/linux/nfsd/export.h index e6c76d9..b892b6a 100644 --- a/include/uapi/linux/nfsd/export.h +++ b/include/uapi/linux/nfsd/export.h @@ -28,7 +28,6 @@ #define NFSEXP_ALLSQUASH 0x0008 #define NFSEXP_ASYNC 0x0010 #define NFSEXP_GATHERED_WRITES 0x0020 -#define NFSEXP_SECURITY_LABEL 0x0040 /* Support security label fattr4 */ /* 80 100 currently unused */ #define NFSEXP_NOHIDE 0x0200 #define NFSEXP_NOSUBTREECHECK 0x0400