Skip to contentSkip to conversation

staging/lustre: fix build error when CONFIG_FS_POSIX_ACL is off

PATCH New Peng Tao 1 participant 2 messages Dec 3, 2013 Staging

lore
Share & tools
lore

Peng Tao

author
#0 lore raw

PATCH 1/2 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:

Quoted 1 line
Quoted 1 line

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>

---
 .../lustre/lustre/include/linux/lustre_acl.h       |   18 +++++++++---------
 drivers/staging/lustre/lustre/include/lustre_mdc.h |    9 +++------
 .../staging/lustre/lustre/llite/llite_internal.h   |    1 +
 drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |    6 ++----
 4 files changed, 15 insertions(+), 19 deletions(-)
drivers/staging/lustre/lustre/include/linux/lustre_acl.h +9 -9
index ff4fc4f..778b123 100644
@@ -47,17 +47,17 @@
 #error	Shoud not include direectly. use #include <lustre_acl.h> instead
 #endif
 
-# 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					\
+#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 /* CONFIG_FS_POSIX_ACL */
-# include <linux/lustre_intent.h>
-# include <linux/xattr.h> /* XATTR_{REPLACE,CREATE} */
+
+#include <linux/lustre_intent.h>
+#include <linux/xattr.h> /* XATTR_{REPLACE,CREATE} */
 
 #ifndef LUSTRE_POSIX_ACL_MAX_SIZE
 # define LUSTRE_POSIX_ACL_MAX_SIZE   0
drivers/staging/lustre/lustre/include/lustre_mdc.h +3 -6
index 1900025..c1e0270 100644
@@ -48,12 +48,9 @@
  * @{
  */
 
-# 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 <linux/fs.h>
+#include <linux/dcache.h>
+#include <linux/lustre_intent.h>
 #include <lustre_handles.h>
 #include <linux/libcfs/libcfs.h>
 #include <obd_class.h>
drivers/staging/lustre/lustre/llite/llite_internal.h +1 -0
index c326ff2..6d15e5c 100644
@@ -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
index e3f02c7..6cc0d6e 100644
@@ -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 <linux/fs.h>
+#include <linux/posix_acl_xattr.h>
 
 #include <obd_support.h>
 #include <obd_class.h>
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/2 staging/lustre: remove wirehdr.c

It is not used.

Cc Andreas Dilger <[email protected]>
---
 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c |   47 ------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c
drivers/staging/lustre/lustre/ptlrpc/wirehdr.c deleted +0 -47
deleted file mode 100644
index 93bc40b..0000000
@@ -1,47 +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.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) 2007, 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.
- */
-
-#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>
-#include <lustre_net.h>
-#include <lustre_disk.h>
Signature · 1 line
1.7.9.5