Skip to content

Commit

Permalink
list.h: Add list_splice_tail() and list_splice_tail_init()
Browse files Browse the repository at this point in the history
If you are using linked lists for queues list_splice() will not do what
you would expect even if you use the elements passed reversed. We need
to handle these differently. We add list_splice_tail() and
list_splice_tail_init().

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Luis R. Rodriguez authored and John W. Linville committed Aug 7, 2008
1 parent e6fce5b commit 7d283ae
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/dma/ioat_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ static dma_cookie_t ioat1_tx_submit(struct dma_async_tx_descriptor *tx)
/* write address into NextDescriptor field of last desc in chain */
to_ioat_desc(ioat_chan->used_desc.prev)->hw->next =
first->async_tx.phys;
__list_splice(&new_chain, ioat_chan->used_desc.prev);
list_splice_tail(&new_chain, &ioat_chan->used_desc);

ioat_chan->dmacount += desc_count;
ioat_chan->pending += desc_count;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-q.c
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ static struct ehci_qh *qh_append_tds (

list_del (&qtd->qtd_list);
list_add (&dummy->qtd_list, qtd_list);
__list_splice (qtd_list, qh->qtd_list.prev);
list_splice_tail(qtd_list, &qh->qtd_list);

ehci_qtd_init(ehci, qtd, qtd->qtd_dma);
qh->dummy = qtd;
Expand Down
47 changes: 38 additions & 9 deletions include/linux/list.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,29 +215,41 @@ static inline int list_is_singular(const struct list_head *head)
}

static inline void __list_splice(const struct list_head *list,
struct list_head *head)
struct list_head *prev,
struct list_head *next)
{
struct list_head *first = list->next;
struct list_head *last = list->prev;
struct list_head *at = head->next;

first->prev = head;
head->next = first;
first->prev = prev;
prev->next = first;

last->next = at;
at->prev = last;
last->next = next;
next->prev = last;
}

/**
* list_splice - join two lists
* list_splice - join two lists, this is designed for stacks
* @list: the new list to add.
* @head: the place to add it in the first list.
*/
static inline void list_splice(const struct list_head *list,
struct list_head *head)
{
if (!list_empty(list))
__list_splice(list, head);
__list_splice(list, head, head->next);
}

/**
* list_splice_tail - join two lists, each list being a queue
* @list: the new list to add.
* @head: the place to add it in the first list.
*/
static inline void list_splice_tail(struct list_head *list,
struct list_head *head)
{
if (!list_empty(list))
__list_splice(list, head->prev, head);
}

/**
Expand All @@ -251,7 +263,24 @@ static inline void list_splice_init(struct list_head *list,
struct list_head *head)
{
if (!list_empty(list)) {
__list_splice(list, head);
__list_splice(list, head, head->next);
INIT_LIST_HEAD(list);
}
}

/**
* list_splice_tail_init - join two lists, each list being a queue, and
* reinitialise the emptied list.
* @list: the new list to add.
* @head: the place to add it in the first list.
*
* The list at @list is reinitialised
*/
static inline void list_splice_tail_init(struct list_head *list,
struct list_head *head)
{
if (!list_empty(list)) {
__list_splice(list, head->prev, head);
INIT_LIST_HEAD(list);
}
}
Expand Down

0 comments on commit 7d283ae

Please sign in to comment.