LU-7973 llite: lock i_lock/dcache_lock before __d_drop()

[fs/lustre-release.git] / lustre / llite / llite_rmtacl.c

diff --git a/lustre/llite/llite_rmtacl.c b/lustre/llite/llite_rmtacl.c
index 4f22a20..7188a49 100644 (file)
--- a/lustre/llite/llite_rmtacl.c
+++ b/lustre/llite/llite_rmtacl.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -44,7 +44,6 @@
 
 #ifdef CONFIG_FS_POSIX_ACL
 
-#include <lustre_lite.h>
 #include <lustre_eacl.h>
 #include "llite_internal.h"
 
@@ -58,7 +57,7 @@ static inline __u32 ee_hashfunc(uid_t id)
         return id & (EE_HASHES - 1);
 }
 
-obd_valid rce_ops2valid(int ops)
+u64 rce_ops2valid(int ops)
 {
         switch (ops) {
         case RMT_LSETFACL: