Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
db6ef1e
..
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) 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/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-44,7
+44,7
@@
#ifdef CONFIG_FS_POSIX_ACL
#ifdef CONFIG_FS_POSIX_ACL
-#include <lustre_
lite
.h>
+#include <lustre_
eacl
.h>
#include "llite_internal.h"
static inline __u32 rce_hashfunc(uid_t id)
#include "llite_internal.h"
static inline __u32 rce_hashfunc(uid_t id)
@@
-57,7
+57,7
@@
static inline __u32 ee_hashfunc(uid_t id)
return id & (EE_HASHES - 1);
}
return id & (EE_HASHES - 1);
}
-
obd_valid
rce_ops2valid(int ops)
+
u64
rce_ops2valid(int ops)
{
switch (ops) {
case RMT_LSETFACL:
{
switch (ops) {
case RMT_LSETFACL:
@@
-81,7
+81,7
@@
static struct rmtacl_ctl_entry *rce_alloc(pid_t key, int ops)
if (!rce)
return NULL;
if (!rce)
return NULL;
-
CFS_
INIT_LIST_HEAD(&rce->rce_list);
+ INIT_LIST_HEAD(&rce->rce_list);
rce->rce_key = key;
rce->rce_ops = ops;
rce->rce_key = key;
rce->rce_ops = ops;
@@
-90,8
+90,8
@@
static struct rmtacl_ctl_entry *rce_alloc(pid_t key, int ops)
static void rce_free(struct rmtacl_ctl_entry *rce)
{
static void rce_free(struct rmtacl_ctl_entry *rce)
{
-
if (!cfs_
list_empty(&rce->rce_list))
-
cfs_
list_del(&rce->rce_list);
+
if (!
list_empty(&rce->rce_list))
+ list_del(&rce->rce_list);
OBD_FREE_PTR(rce);
}
OBD_FREE_PTR(rce);
}
@@
-100,9
+100,9
@@
static struct rmtacl_ctl_entry *__rct_search(struct rmtacl_ctl_table *rct,
pid_t key)
{
struct rmtacl_ctl_entry *rce;
pid_t key)
{
struct rmtacl_ctl_entry *rce;
-
cfs_list_t
*head = &rct->rct_entries[rce_hashfunc(key)];
+
struct list_head
*head = &rct->rct_entries[rce_hashfunc(key)];
-
cfs_
list_for_each_entry(rce, head, rce_list)
+ list_for_each_entry(rce, head, rce_list)
if (rce->rce_key == key)
return rce;
if (rce->rce_key == key)
return rce;
@@
-134,7
+134,7
@@
int rct_add(struct rmtacl_ctl_table *rct, pid_t key, int ops)
"[key: %d] [ops: %d]\n", (int)key, ops);
rce_free(e);
}
"[key: %d] [ops: %d]\n", (int)key, ops);
rce_free(e);
}
-
cfs_
list_add_tail(&rce->rce_list, &rct->rct_entries[rce_hashfunc(key)]);
+ list_add_tail(&rce->rce_list, &rct->rct_entries[rce_hashfunc(key)]);
spin_unlock(&rct->rct_lock);
return 0;
spin_unlock(&rct->rct_lock);
return 0;
@@
-159,7
+159,7
@@
void rct_init(struct rmtacl_ctl_table *rct)
spin_lock_init(&rct->rct_lock);
for (i = 0; i < RCE_HASHES; i++)
spin_lock_init(&rct->rct_lock);
for (i = 0; i < RCE_HASHES; i++)
-
CFS_
INIT_LIST_HEAD(&rct->rct_entries[i]);
+ INIT_LIST_HEAD(&rct->rct_entries[i]);
}
void rct_fini(struct rmtacl_ctl_table *rct)
}
void rct_fini(struct rmtacl_ctl_table *rct)
@@
-169,8
+169,8
@@
void rct_fini(struct rmtacl_ctl_table *rct)
spin_lock(&rct->rct_lock);
for (i = 0; i < RCE_HASHES; i++)
spin_lock(&rct->rct_lock);
for (i = 0; i < RCE_HASHES; i++)
- while (!
cfs_
list_empty(&rct->rct_entries[i])) {
- rce =
cfs_
list_entry(rct->rct_entries[i].next,
+ while (!list_empty(&rct->rct_entries[i])) {
+ rce = list_entry(rct->rct_entries[i].next,
struct rmtacl_ctl_entry, rce_list);
rce_free(rce);
}
struct rmtacl_ctl_entry, rce_list);
rce_free(rce);
}
@@
-187,7
+187,7
@@
static struct eacl_entry *ee_alloc(pid_t key, struct lu_fid *fid, int type,
if (!ee)
return NULL;
if (!ee)
return NULL;
-
CFS_
INIT_LIST_HEAD(&ee->ee_list);
+ INIT_LIST_HEAD(&ee->ee_list);
ee->ee_key = key;
ee->ee_fid = *fid;
ee->ee_type = type;
ee->ee_key = key;
ee->ee_fid = *fid;
ee->ee_type = type;
@@
-198,8
+198,8
@@
static struct eacl_entry *ee_alloc(pid_t key, struct lu_fid *fid, int type,
void ee_free(struct eacl_entry *ee)
{
void ee_free(struct eacl_entry *ee)
{
-
if (!cfs_
list_empty(&ee->ee_list))
-
cfs_
list_del(&ee->ee_list);
+
if (!
list_empty(&ee->ee_list))
+ list_del(&ee->ee_list);
if (ee->ee_acl)
lustre_ext_acl_xattr_free(ee->ee_acl);
if (ee->ee_acl)
lustre_ext_acl_xattr_free(ee->ee_acl);
@@
-211,14
+211,14
@@
static struct eacl_entry *__et_search_del(struct eacl_table *et, pid_t key,
struct lu_fid *fid, int type)
{
struct eacl_entry *ee;
struct lu_fid *fid, int type)
{
struct eacl_entry *ee;
-
cfs_list_t
*head = &et->et_entries[ee_hashfunc(key)];
+
struct list_head
*head = &et->et_entries[ee_hashfunc(key)];
LASSERT(fid != NULL);
LASSERT(fid != NULL);
-
cfs_
list_for_each_entry(ee, head, ee_list)
+ list_for_each_entry(ee, head, ee_list)
if (ee->ee_key == key) {
if (lu_fid_eq(&ee->ee_fid, fid) &&
ee->ee_type == type) {
if (ee->ee_key == key) {
if (lu_fid_eq(&ee->ee_fid, fid) &&
ee->ee_type == type) {
-
cfs_
list_del_init(&ee->ee_list);
+ list_del_init(&ee->ee_list);
return ee;
}
}
return ee;
}
}
@@
-240,10
+240,10
@@
struct eacl_entry *et_search_del(struct eacl_table *et, pid_t key,
void et_search_free(struct eacl_table *et, pid_t key)
{
struct eacl_entry *ee, *next;
void et_search_free(struct eacl_table *et, pid_t key)
{
struct eacl_entry *ee, *next;
-
cfs_list_t
*head = &et->et_entries[ee_hashfunc(key)];
+
struct list_head
*head = &et->et_entries[ee_hashfunc(key)];
spin_lock(&et->et_lock);
spin_lock(&et->et_lock);
-
cfs_
list_for_each_entry_safe(ee, next, head, ee_list)
+ list_for_each_entry_safe(ee, next, head, ee_list)
if (ee->ee_key == key)
ee_free(ee);
if (ee->ee_key == key)
ee_free(ee);
@@
-267,7
+267,7
@@
int ee_add(struct eacl_table *et, pid_t key, struct lu_fid *fid, int type,
(int)key, PFID(fid), type);
ee_free(e);
}
(int)key, PFID(fid), type);
ee_free(e);
}
-
cfs_
list_add_tail(&ee->ee_list, &et->et_entries[ee_hashfunc(key)]);
+ list_add_tail(&ee->ee_list, &et->et_entries[ee_hashfunc(key)]);
spin_unlock(&et->et_lock);
return 0;
spin_unlock(&et->et_lock);
return 0;
@@
-279,7
+279,7
@@
void et_init(struct eacl_table *et)
spin_lock_init(&et->et_lock);
for (i = 0; i < EE_HASHES; i++)
spin_lock_init(&et->et_lock);
for (i = 0; i < EE_HASHES; i++)
-
CFS_
INIT_LIST_HEAD(&et->et_entries[i]);
+ INIT_LIST_HEAD(&et->et_entries[i]);
}
void et_fini(struct eacl_table *et)
}
void et_fini(struct eacl_table *et)
@@
-289,9
+289,9
@@
void et_fini(struct eacl_table *et)
spin_lock(&et->et_lock);
for (i = 0; i < EE_HASHES; i++)
spin_lock(&et->et_lock);
for (i = 0; i < EE_HASHES; i++)
- while (!
cfs_
list_empty(&et->et_entries[i])) {
- ee =
cfs_
list_entry(et->et_entries[i].next,
-
struct eacl_entry, ee_list);
+ while (!list_empty(&et->et_entries[i])) {
+ ee = list_entry(et->et_entries[i].next,
+ struct eacl_entry, ee_list);
ee_free(ee);
}
spin_unlock(&et->et_lock);
ee_free(ee);
}
spin_unlock(&et->et_lock);