From 7d835840219d06515bf7aa860cc915840ee00d43 Mon Sep 17 00:00:00 2001 From: Gargi Sharma Date: Thu, 2 Mar 2017 23:12:55 +0530 Subject: [PATCH] staging: lustre: Remove lustre_eacl.h The structures and the macros in the header file are not used anywhere inside the kernel (verified by using grep). The structures and macros were leftover from the patch 341f1f0affed1c24712f37c95bb654b3b33ab2c6 "staging: lustre: remove remote client support". Also, removed the include statements for lustre_eacl.h. Signed-off-by: Gargi Sharma Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Signed-off-by: Greg Kroah-Hartman --- .../lustre/lustre/include/lustre_eacl.h | 74 ------------------- .../lustre/lustre/llite/llite_internal.h | 1 - drivers/staging/lustre/lustre/llite/xattr.c | 1 - 3 files changed, 76 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/lustre_eacl.h diff --git a/drivers/staging/lustre/lustre/include/lustre_eacl.h b/drivers/staging/lustre/lustre/include/lustre_eacl.h deleted file mode 100644 index c198eda14054..000000000000 --- a/drivers/staging/lustre/lustre/include/lustre_eacl.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see - * http://www.gnu.org/licenses/gpl-2.0.html - * - * GPL HEADER END - */ -/* - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ -/* - * Copyright (c) 2011, 2012, Intel Corporation. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - * - * lustre/lustre/include/lustre_idmap.h - * - * MDS data structures. - * See also lustre_idl.h for wire formats of requests. - */ - -#ifndef _LUSTRE_EACL_H -#define _LUSTRE_EACL_H - -/** \defgroup eacl eacl - * - * @{ - */ - -#ifdef CONFIG_FS_POSIX_ACL - -#include -#include - -struct ext_acl_xattr_entry { - __u16 e_tag; - __u16 e_perm; - __u32 e_id; - __u32 e_stat; -}; - -struct ext_acl_xattr_header { - __u32 a_count; - struct ext_acl_xattr_entry a_entries[0]; -}; - -#define CFS_ACL_XATTR_SIZE(count, prefix) \ - (sizeof(prefix ## _header) + (count) * sizeof(prefix ## _entry)) - -#define CFS_ACL_XATTR_COUNT(size, prefix) \ - (((size) - sizeof(prefix ## _header)) / sizeof(prefix ## _entry)) - -#endif /* CONFIG_FS_POSIX_ACL */ - -/** @} eacl */ - -#endif diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h index 2d2b74109d72..d2a0fabd8a69 100644 --- a/drivers/staging/lustre/lustre/llite/llite_internal.h +++ b/drivers/staging/lustre/lustre/llite/llite_internal.h @@ -35,7 +35,6 @@ #include "../include/lustre_debug.h" #include "../include/lustre_ver.h" #include "../include/lustre_disk.h" /* for s2sbi */ -#include "../include/lustre_eacl.h" #include "../include/lustre_linkea.h" /* for struct cl_lock_descr and struct cl_io */ diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c index 3ef0291310db..6187bffec8c4 100644 --- a/drivers/staging/lustre/lustre/llite/xattr.c +++ b/drivers/staging/lustre/lustre/llite/xattr.c @@ -40,7 +40,6 @@ #include "../include/obd_support.h" #include "../include/lustre_dlm.h" #include "../include/lustre_ver.h" -#include "../include/lustre_eacl.h" #include "llite_internal.h" -- 2.30.2