Commit ec0859da authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging/lustre remove linux/lustre_acl.h 



Move the contents of lustre/include/linux/lustre_acl.h to
lustre/include/lustre_acl.h and remove the first header.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a9c7db39

drivers/staging/lustre/lustre/include/linux/lustre_acl.h

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
/*

 * 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.sun.com/software/products/lustre/docs/GPLv2.pdf

 *

 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,

 * CA 95054 USA or visit www.sun.com if you need additional information or

 * have any questions.

 *

 * GPL HEADER END

 */

/*

 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.

 * Use is subject to license terms.

 */

/*

 * Copyright (c) 2011, Intel Corporation.

 */

/*

 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 *

 * lustre/lustre/include/lustre_acl.h

 *

 * MDS data structures.

 * See also lustre_idl.h for wire formats of requests.

 */



#ifndef _LUSTRE_LINUX_ACL_H

#define _LUSTRE_LINUX_ACL_H



#ifndef	_LUSTRE_ACL_H

#error	Should not include directly. use #include <lustre_acl.h> instead

#endif



#include <linux/fs.h>

#include <linux/dcache.h>



#include <linux/posix_acl_xattr.h>

#define LUSTRE_POSIX_ACL_MAX_ENTRIES	32

#define LUSTRE_POSIX_ACL_MAX_SIZE					\

	(sizeof(posix_acl_xattr_header) +				\

	 LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry))



#include "lustre_intent.h"

#include <linux/xattr.h> /* XATTR_{REPLACE,CREATE} */



#ifndef LUSTRE_POSIX_ACL_MAX_SIZE

# define LUSTRE_POSIX_ACL_MAX_SIZE   0

#endif



#endif /* _LUSTRE_LINUX_ACL_H */

drivers/staging/lustre/lustre/include/lustre_acl.h

+8 −1
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ 
#ifndef _LUSTRE_ACL_H

#define _LUSTRE_ACL_H



#include "linux/lustre_acl.h"

#include <linux/fs.h>

#include <linux/dcache.h>

#include <linux/posix_acl_xattr.h>



#define LUSTRE_POSIX_ACL_MAX_ENTRIES	32

#define LUSTRE_POSIX_ACL_MAX_SIZE					\

	(sizeof(posix_acl_xattr_header) +				\

	 LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry))



#endif