hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IB/hfi1: Rename TID mmu_rb_* functions 

Clarify the names of the TID mmu functions.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dean Luick <dean.luick@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Dean Luick 2016-07-28 12:27:37 -04:00 committed by Doug Ledford
parent 20a42d0833
commit a7cd2dc5d4
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/infiniband/hw/hfi1/user_exp_rcv.c
View File

@ -86,10 +86,10 @@ static void unlock_exp_tids(struct hfi1_ctxtdata *, struct exp_tid_set *,
static u32 find_phys_blocks(struct page **, unsigned, struct tid_pageset *); static u32 find_phys_blocks(struct page **, unsigned, struct tid_pageset *);
static int set_rcvarray_entry(struct file *, unsigned long, u32, static int set_rcvarray_entry(struct file *, unsigned long, u32,
struct tid_group *, struct page **, unsigned); struct tid_group *, struct page **, unsigned);
static int mmu_rb_insert(struct rb_root *, struct mmu_rb_node *); static int tid_rb_insert(struct rb_root *, struct mmu_rb_node *);
static void mmu_rb_remove(struct rb_root *, struct mmu_rb_node *, static void tid_rb_remove(struct rb_root *, struct mmu_rb_node *,
struct mm_struct *); struct mm_struct *);
static int mmu_rb_invalidate(struct rb_root *, struct mmu_rb_node *); static int tid_rb_invalidate(struct rb_root *, struct mmu_rb_node *);
static int program_rcvarray(struct file *, unsigned long, struct tid_group *, static int program_rcvarray(struct file *, unsigned long, struct tid_group *,
struct tid_pageset *, unsigned, u16, struct page **, struct tid_pageset *, unsigned, u16, struct page **,
u32 *, unsigned *, unsigned *); u32 *, unsigned *, unsigned *);
@ -97,9 +97,9 @@ static int unprogram_rcvarray(struct file *, u32, struct tid_group **);
static void clear_tid_node(struct hfi1_filedata *, struct tid_rb_node *); static void clear_tid_node(struct hfi1_filedata *, struct tid_rb_node *);
static struct mmu_rb_ops tid_rb_ops = { static struct mmu_rb_ops tid_rb_ops = {
.insert = mmu_rb_insert, .insert = tid_rb_insert,
.remove = mmu_rb_remove, .remove = tid_rb_remove,
.invalidate = mmu_rb_invalidate .invalidate = tid_rb_invalidate
}; };
static inline u32 rcventry2tidinfo(u32 rcventry) static inline u32 rcventry2tidinfo(u32 rcventry)
@ -862,7 +862,7 @@ static int set_rcvarray_entry(struct file *fp, unsigned long vaddr,
memcpy(node->pages, pages, sizeof(struct page *) * npages); memcpy(node->pages, pages, sizeof(struct page *) * npages);
if (HFI1_CAP_IS_USET(TID_UNMAP)) if (HFI1_CAP_IS_USET(TID_UNMAP))
ret = mmu_rb_insert(root, &node->mmu); ret = tid_rb_insert(root, &node->mmu);
else else
ret = hfi1_mmu_rb_insert(root, &node->mmu); ret = hfi1_mmu_rb_insert(root, &node->mmu);
@ -905,7 +905,7 @@ static int unprogram_rcvarray(struct file *fp, u32 tidinfo,
if (!node || node->rcventry != (uctxt->expected_base + rcventry)) if (!node || node->rcventry != (uctxt->expected_base + rcventry))
return -EBADF; return -EBADF;
if (HFI1_CAP_IS_USET(TID_UNMAP)) if (HFI1_CAP_IS_USET(TID_UNMAP))
mmu_rb_remove(&fd->tid_rb_root, &node->mmu, NULL); tid_rb_remove(&fd->tid_rb_root, &node->mmu, NULL);
else else
hfi1_mmu_rb_remove(&fd->tid_rb_root, &node->mmu); hfi1_mmu_rb_remove(&fd->tid_rb_root, &node->mmu);
@ -969,7 +969,7 @@ static void unlock_exp_tids(struct hfi1_ctxtdata *uctxt,
if (!node || node->rcventry != rcventry) if (!node || node->rcventry != rcventry)
continue; continue;
if (HFI1_CAP_IS_USET(TID_UNMAP)) if (HFI1_CAP_IS_USET(TID_UNMAP))
mmu_rb_remove(&fd->tid_rb_root, tid_rb_remove(&fd->tid_rb_root,
&node->mmu, NULL); &node->mmu, NULL);
else else
hfi1_mmu_rb_remove(&fd->tid_rb_root, hfi1_mmu_rb_remove(&fd->tid_rb_root,
@ -980,7 +980,7 @@ static void unlock_exp_tids(struct hfi1_ctxtdata *uctxt,
} }
} }
static int mmu_rb_invalidate(struct rb_root *root, struct mmu_rb_node *mnode) static int tid_rb_invalidate(struct rb_root *root, struct mmu_rb_node *mnode)
{ {
struct hfi1_filedata *fdata = struct hfi1_filedata *fdata =
container_of(root, struct hfi1_filedata, tid_rb_root); container_of(root, struct hfi1_filedata, tid_rb_root);
@ -1024,7 +1024,7 @@ static int mmu_rb_invalidate(struct rb_root *root, struct mmu_rb_node *mnode)
return 0; return 0;
} }
static int mmu_rb_insert(struct rb_root *root, struct mmu_rb_node *node) static int tid_rb_insert(struct rb_root *root, struct mmu_rb_node *node)
{ {
struct hfi1_filedata *fdata = struct hfi1_filedata *fdata =
container_of(root, struct hfi1_filedata, tid_rb_root); container_of(root, struct hfi1_filedata, tid_rb_root);
@ -1036,7 +1036,7 @@ static int mmu_rb_insert(struct rb_root *root, struct mmu_rb_node *node)
return 0; return 0;
} }
static void mmu_rb_remove(struct rb_root *root, struct mmu_rb_node *node, static void tid_rb_remove(struct rb_root *root, struct mmu_rb_node *node,
struct mm_struct *mm) struct mm_struct *mm)
{ {
struct hfi1_filedata *fdata = struct hfi1_filedata *fdata =