* 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 [sun.com URL with a
- * copy of GPLv2].
+ * 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
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
{
struct ll_remote_perm *lrp;
- OBD_SLAB_ALLOC(lrp, ll_remote_perm_cachep, GFP_KERNEL, sizeof(*lrp));
+ OBD_SLAB_ALLOC_PTR_GFP(lrp, ll_remote_perm_cachep, GFP_KERNEL);
if (lrp)
- INIT_HLIST_NODE(&lrp->lrp_list);
+ CFS_INIT_HLIST_NODE(&lrp->lrp_list);
return lrp;
}
if (!lrp)
return;
- if (!hlist_unhashed(&lrp->lrp_list))
- hlist_del(&lrp->lrp_list);
+ if (!cfs_hlist_unhashed(&lrp->lrp_list))
+ cfs_hlist_del(&lrp->lrp_list);
OBD_SLAB_FREE(lrp, ll_remote_perm_cachep, sizeof(*lrp));
}
-struct hlist_head *alloc_rmtperm_hash(void)
+cfs_hlist_head_t *alloc_rmtperm_hash(void)
{
- struct hlist_head *hash;
+ cfs_hlist_head_t *hash;
int i;
OBD_SLAB_ALLOC(hash, ll_rmtperm_hash_cachep, GFP_KERNEL,
return NULL;
for (i = 0; i < REMOTE_PERM_HASHSIZE; i++)
- INIT_HLIST_HEAD(hash + i);
+ CFS_INIT_HLIST_HEAD(hash + i);
return hash;
}
-void free_rmtperm_hash(struct hlist_head *hash)
+void free_rmtperm_hash(cfs_hlist_head_t *hash)
{
int i;
struct ll_remote_perm *lrp;
- struct hlist_node *node, *next;
+ cfs_hlist_node_t *node, *next;
if(!hash)
return;
for (i = 0; i < REMOTE_PERM_HASHSIZE; i++)
- hlist_for_each_entry_safe(lrp, node, next, hash + i, lrp_list)
+ cfs_hlist_for_each_entry_safe(lrp, node, next, hash + i,
+ lrp_list)
free_ll_remote_perm(lrp);
OBD_SLAB_FREE(hash, ll_rmtperm_hash_cachep,
REMOTE_PERM_HASHSIZE * sizeof(*hash));
* MDT when client get remote permission. */
static int do_check_remote_perm(struct ll_inode_info *lli, int mask)
{
- struct hlist_head *head;
+ cfs_hlist_head_t *head;
struct ll_remote_perm *lrp;
- struct hlist_node *node;
+ cfs_hlist_node_t *node;
int found = 0, rc;
ENTRY;
if (!lli->lli_remote_perms)
RETURN(-ENOENT);
- head = lli->lli_remote_perms + remote_perm_hashfunc(current->uid);
+ head = lli->lli_remote_perms + remote_perm_hashfunc(cfs_curproc_uid());
- spin_lock(&lli->lli_lock);
- hlist_for_each_entry(lrp, node, head, lrp_list) {
- if (lrp->lrp_uid != current->uid)
+ cfs_spin_lock(&lli->lli_lock);
+ cfs_hlist_for_each_entry(lrp, node, head, lrp_list) {
+ if (lrp->lrp_uid != cfs_curproc_uid())
continue;
- if (lrp->lrp_gid != current->gid)
+ if (lrp->lrp_gid != cfs_curproc_gid())
continue;
- if (lrp->lrp_fsuid != current->fsuid)
+ if (lrp->lrp_fsuid != cfs_curproc_fsuid())
continue;
- if (lrp->lrp_fsgid != current->fsgid)
+ if (lrp->lrp_fsgid != cfs_curproc_fsgid())
continue;
found = 1;
break;
rc = ((lrp->lrp_access_perm & mask) == mask) ? 0 : -EACCES;
out:
- spin_unlock(&lli->lli_lock);
+ cfs_spin_unlock(&lli->lli_lock);
return rc;
}
{
struct ll_inode_info *lli = ll_i2info(inode);
struct ll_remote_perm *lrp = NULL, *tmp = NULL;
- struct hlist_head *head, *perm_hash = NULL;
- struct hlist_node *node;
+ cfs_hlist_head_t *head, *perm_hash = NULL;
+ cfs_hlist_node_t *node;
ENTRY;
LASSERT(ll_i2sbi(inode)->ll_flags & LL_SBI_RMT_CLIENT);
}
}
- spin_lock(&lli->lli_lock);
+ cfs_spin_lock(&lli->lli_lock);
if (!lli->lli_remote_perms)
lli->lli_remote_perms = perm_hash;
head = lli->lli_remote_perms + remote_perm_hashfunc(perm->rp_uid);
again:
- hlist_for_each_entry(tmp, node, head, lrp_list) {
+ cfs_hlist_for_each_entry(tmp, node, head, lrp_list) {
if (tmp->lrp_uid != perm->rp_uid)
continue;
if (tmp->lrp_gid != perm->rp_gid)
}
if (!lrp) {
- spin_unlock(&lli->lli_lock);
+ cfs_spin_unlock(&lli->lli_lock);
lrp = alloc_ll_remote_perm();
if (!lrp) {
CERROR("alloc memory for ll_remote_perm failed!\n");
RETURN(-ENOMEM);
}
- spin_lock(&lli->lli_lock);
+ cfs_spin_lock(&lli->lli_lock);
goto again;
}
lrp->lrp_gid = perm->rp_gid;
lrp->lrp_fsuid = perm->rp_fsuid;
lrp->lrp_fsgid = perm->rp_fsgid;
- hlist_add_head(&lrp->lrp_list, head);
+ cfs_hlist_add_head(&lrp->lrp_list, head);
}
lli->lli_rmtperm_utime = jiffies;
- spin_unlock(&lli->lli_lock);
+ cfs_spin_unlock(&lli->lli_lock);
CDEBUG(D_SEC, "new remote perm@%p: %u/%u/%u/%u - %#x\n",
lrp, lrp->lrp_uid, lrp->lrp_gid, lrp->lrp_fsuid, lrp->lrp_fsgid,
if (!rc || (rc != -ENOENT && i))
break;
- might_sleep();
+ cfs_might_sleep();
- down(&lli->lli_rmtperm_sem);
+ cfs_down(&lli->lli_rmtperm_sem);
/* check again */
if (utime != lli->lli_rmtperm_utime) {
rc = do_check_remote_perm(lli, mask);
if (!rc || (rc != -ENOENT && i)) {
- up(&lli->lli_rmtperm_sem);
+ cfs_up(&lli->lli_rmtperm_sem);
break;
}
}
ll_i2suppgid(inode), &req);
capa_put(oc);
if (rc) {
- up(&lli->lli_rmtperm_sem);
+ cfs_up(&lli->lli_rmtperm_sem);
break;
}
perm = req_capsule_server_swab_get(&req->rq_pill, &RMF_ACL,
lustre_swab_mdt_remote_perm);
if (unlikely(perm == NULL)) {
- up(&lli->lli_rmtperm_sem);
+ cfs_up(&lli->lli_rmtperm_sem);
rc = -EPROTO;
break;
}
rc = ll_update_remote_perm(inode, perm);
- up(&lli->lli_rmtperm_sem);
+ cfs_up(&lli->lli_rmtperm_sem);
if (rc == -ENOMEM)
break;
void ll_free_remote_perms(struct inode *inode)
{
struct ll_inode_info *lli = ll_i2info(inode);
- struct hlist_head *hash = lli->lli_remote_perms;
+ cfs_hlist_head_t *hash = lli->lli_remote_perms;
struct ll_remote_perm *lrp;
- struct hlist_node *node, *next;
+ cfs_hlist_node_t *node, *next;
int i;
LASSERT(hash);
- spin_lock(&lli->lli_lock);
+ cfs_spin_lock(&lli->lli_lock);
for (i = 0; i < REMOTE_PERM_HASHSIZE; i++) {
- hlist_for_each_entry_safe(lrp, node, next, hash + i, lrp_list)
+ cfs_hlist_for_each_entry_safe(lrp, node, next, hash + i,
+ lrp_list)
free_ll_remote_perm(lrp);
}
- spin_unlock(&lli->lli_lock);
+ cfs_spin_unlock(&lli->lli_lock);
}
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff