Commit 082b3532 authored by Dean Luick's avatar Dean Luick Committed by Doug Ledford

IB/hfi1: Remove unneeded mm argument in remove function

The reworked mmu_rb interface allows the unused mm argument to be removed.
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent b85ced91
...@@ -253,8 +253,7 @@ void hfi1_mmu_rb_evict(struct mmu_rb_handler *handler, void *evict_arg) ...@@ -253,8 +253,7 @@ void hfi1_mmu_rb_evict(struct mmu_rb_handler *handler, void *evict_arg)
while (!list_empty(&del_list)) { while (!list_empty(&del_list)) {
rbnode = list_first_entry(&del_list, struct mmu_rb_node, list); rbnode = list_first_entry(&del_list, struct mmu_rb_node, list);
list_del(&rbnode->list); list_del(&rbnode->list);
handler->ops->remove(handler->ops_arg, rbnode, handler->ops->remove(handler->ops_arg, rbnode);
handler->mm);
} }
} }
...@@ -275,7 +274,7 @@ void hfi1_mmu_rb_remove(struct mmu_rb_handler *handler, ...@@ -275,7 +274,7 @@ void hfi1_mmu_rb_remove(struct mmu_rb_handler *handler,
__mmu_int_rb_remove(node, &handler->root); __mmu_int_rb_remove(node, &handler->root);
spin_unlock_irqrestore(&handler->lock, flags); spin_unlock_irqrestore(&handler->lock, flags);
handler->ops->remove(handler->ops_arg, node, NULL); handler->ops->remove(handler->ops_arg, node);
} }
static inline void mmu_notifier_page(struct mmu_notifier *mn, static inline void mmu_notifier_page(struct mmu_notifier *mn,
...@@ -335,7 +334,7 @@ static void do_remove(struct mmu_rb_handler *handler, ...@@ -335,7 +334,7 @@ static void do_remove(struct mmu_rb_handler *handler,
while (!list_empty(del_list)) { while (!list_empty(del_list)) {
node = list_first_entry(del_list, struct mmu_rb_node, list); node = list_first_entry(del_list, struct mmu_rb_node, list);
list_del(&node->list); list_del(&node->list);
handler->ops->remove(handler->ops_arg, node, handler->mm); handler->ops->remove(handler->ops_arg, node);
} }
} }
......
...@@ -65,8 +65,7 @@ struct mmu_rb_ops { ...@@ -65,8 +65,7 @@ struct mmu_rb_ops {
bool (*filter)(struct mmu_rb_node *node, unsigned long addr, bool (*filter)(struct mmu_rb_node *node, unsigned long addr,
unsigned long len); unsigned long len);
int (*insert)(void *ops_arg, struct mmu_rb_node *mnode); int (*insert)(void *ops_arg, struct mmu_rb_node *mnode);
void (*remove)(void *ops_arg, struct mmu_rb_node *mnode, void (*remove)(void *ops_arg, struct mmu_rb_node *mnode);
struct mm_struct *mm);
int (*invalidate)(void *ops_arg, struct mmu_rb_node *node); int (*invalidate)(void *ops_arg, struct mmu_rb_node *node);
int (*evict)(void *ops_arg, struct mmu_rb_node *mnode, int (*evict)(void *ops_arg, struct mmu_rb_node *mnode,
void *evict_arg, bool *stop); void *evict_arg, bool *stop);
......
...@@ -87,8 +87,7 @@ static u32 find_phys_blocks(struct page **, unsigned, struct tid_pageset *); ...@@ -87,8 +87,7 @@ 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 tid_rb_insert(void *, struct mmu_rb_node *); static int tid_rb_insert(void *, struct mmu_rb_node *);
static void tid_rb_remove(void *, struct mmu_rb_node *, static void tid_rb_remove(void *, struct mmu_rb_node *);
struct mm_struct *);
static int tid_rb_invalidate(void *, struct mmu_rb_node *); static int tid_rb_invalidate(void *, 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 **,
...@@ -901,7 +900,7 @@ static int unprogram_rcvarray(struct file *fp, u32 tidinfo, ...@@ -901,7 +900,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 (!fd->handler) if (!fd->handler)
tid_rb_remove(fd, &node->mmu, fd->mm); tid_rb_remove(fd, &node->mmu);
else else
hfi1_mmu_rb_remove(fd->handler, &node->mmu); hfi1_mmu_rb_remove(fd->handler, &node->mmu);
...@@ -964,7 +963,7 @@ static void unlock_exp_tids(struct hfi1_ctxtdata *uctxt, ...@@ -964,7 +963,7 @@ static void unlock_exp_tids(struct hfi1_ctxtdata *uctxt,
if (!node || node->rcventry != rcventry) if (!node || node->rcventry != rcventry)
continue; continue;
if (!fd->handler) if (!fd->handler)
tid_rb_remove(fd, &node->mmu, fd->mm); tid_rb_remove(fd, &node->mmu);
else else
hfi1_mmu_rb_remove(fd->handler, hfi1_mmu_rb_remove(fd->handler,
&node->mmu); &node->mmu);
...@@ -1028,8 +1027,7 @@ static int tid_rb_insert(void *arg, struct mmu_rb_node *node) ...@@ -1028,8 +1027,7 @@ static int tid_rb_insert(void *arg, struct mmu_rb_node *node)
return 0; return 0;
} }
static void tid_rb_remove(void *arg, struct mmu_rb_node *node, static void tid_rb_remove(void *arg, struct mmu_rb_node *node)
struct mm_struct *mm)
{ {
struct hfi1_filedata *fdata = arg; struct hfi1_filedata *fdata = arg;
struct tid_rb_node *tnode = struct tid_rb_node *tnode =
......
...@@ -310,7 +310,7 @@ static bool sdma_rb_filter(struct mmu_rb_node *, unsigned long, unsigned long); ...@@ -310,7 +310,7 @@ static bool sdma_rb_filter(struct mmu_rb_node *, unsigned long, unsigned long);
static int sdma_rb_insert(void *, struct mmu_rb_node *); static int sdma_rb_insert(void *, struct mmu_rb_node *);
static int sdma_rb_evict(void *arg, struct mmu_rb_node *mnode, static int sdma_rb_evict(void *arg, struct mmu_rb_node *mnode,
void *arg2, bool *stop); void *arg2, bool *stop);
static void sdma_rb_remove(void *, struct mmu_rb_node *, struct mm_struct *); static void sdma_rb_remove(void *, struct mmu_rb_node *);
static int sdma_rb_invalidate(void *, struct mmu_rb_node *); static int sdma_rb_invalidate(void *, struct mmu_rb_node *);
static struct mmu_rb_ops sdma_rb_ops = { static struct mmu_rb_ops sdma_rb_ops = {
...@@ -1643,8 +1643,7 @@ static int sdma_rb_evict(void *arg, struct mmu_rb_node *mnode, ...@@ -1643,8 +1643,7 @@ static int sdma_rb_evict(void *arg, struct mmu_rb_node *mnode,
return 1; /* remove this node */ return 1; /* remove this node */
} }
static void sdma_rb_remove(void *arg, struct mmu_rb_node *mnode, static void sdma_rb_remove(void *arg, struct mmu_rb_node *mnode)
struct mm_struct *mm)
{ {
struct sdma_mmu_node *node = struct sdma_mmu_node *node =
container_of(mnode, struct sdma_mmu_node, rb); container_of(mnode, struct sdma_mmu_node, rb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment