Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04eb2b7f authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

staging/lustre: fix build error when CONFIG_FS_POSIX_ACL is off 



We need to include <linux/posix_acl_xattr.h> regardless of
CONFIG_FS_POSIX_ACL is set or not. Otherwise build fails as
reported by kbuild robot:

>> drivers/staging/lustre/lustre/llite/file.c:2965:2: error: implicit declaration of function 'posix_acl_dup' [-Werror=implicit-function-declaration]
     acl = posix_acl_dup(lli->lli_posix_acl);
<many similar errors omitted>

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b89f3b94

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

+9 −9
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ 


#include <linux/fs.h>

#include <linux/dcache.h>

# ifdef CONFIG_FS_POSIX_ACL



#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 /* CONFIG_FS_POSIX_ACL */



#include <linux/lustre_intent.h>

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

drivers/staging/lustre/lustre/include/lustre_mdc.h

+3 −6
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ 


#include <linux/fs.h>

#include <linux/dcache.h>

# ifdef CONFIG_FS_POSIX_ACL

#  include <linux/posix_acl_xattr.h>

# endif /* CONFIG_FS_POSIX_ACL */

#include <linux/lustre_intent.h>

#include <lustre_handles.h>

#include <linux/libcfs/libcfs.h>

drivers/staging/lustre/lustre/llite/llite_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <lustre_mdc.h>

#include <linux/lustre_intent.h>

#include <linux/compat.h>

#include <linux/posix_acl_xattr.h>



#ifndef FMODE_EXEC

#define FMODE_EXEC 0

drivers/staging/lustre/lustre/ptlrpc/wiretest.c

+2 −4
Original line number Diff line number Diff line
@@ -36,10 +36,8 @@ 


#define DEBUG_SUBSYSTEM S_RPC



# ifdef CONFIG_FS_POSIX_ACL

#include <linux/fs.h>

#include <linux/posix_acl_xattr.h>

# endif



#include <obd_support.h>

#include <obd_class.h>