Skip to content

Z
ZIO
Commit 216e8787 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

promote __try_push() to generic trigger helper 

Signed-off-by: 's avatarFederico Vaga <federico.vaga@gmail.com>
Acked-by: 's avatarAlessandro Rubini <rubinig@gnudd.com>
parent d7eae403
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 48 deletions
buffers/zio-buf-kmalloc.c
View file @ 216e8787
......@@ -130,29 +130,6 @@ static void zbk_free_block(struct zio_bi *bi, struct zio_block *block)
wake_up_interruptible(&bi->q);
}
/* When write() stores the first block, we try pushing it */
static inline int __try_push(struct zio_bi *bi, struct zio_channel *chan,
struct zio_block *block)
{
struct zio_ti *ti = chan->cset->ti;
int pushed;
/* chek if trigger is disabled */
if (unlikely((ti->flags & ZIO_STATUS) == ZIO_DISABLED))
return 0;
/*
* If push succeeds and the device eats data immediately,
* the trigger may call retr_block right now. So
* release the lock but also say we can't retrieve now.
*/
bi->flags |= ZIO_BI_PUSHING;
spin_unlock(&bi->lock); /* Don't irqrestore here, keep them disabled */
pushed = (ti->t_op->push_block(ti, chan, block) == 0);
spin_lock(&bi->lock);
bi->flags &= ~ZIO_BI_PUSHING;
return pushed;
}
/* Store is called by the trigger (for input) or by f->write (for output) */
static int zbk_store_block(struct zio_bi *bi, struct zio_block *block)
{
......@@ -171,7 +148,7 @@ static int zbk_store_block(struct zio_bi *bi, struct zio_block *block)
list_add_tail(&item->list, &zbki->list);
if (isempty) {
if (unlikely(output))
pushed = __try_push(bi, chan, block);
pushed = zio_trigger_try_push(bi, chan, block);
else
awake = 1;
}
......
buffers/zio-buf-vmalloc.c
View file @ 216e8787
......@@ -173,29 +173,6 @@ static void zbk_try_merge(struct zbk_instance *zbki, struct zbk_item *item)
kmem_cache_free(zbk_slab, item);
}
/* When write() stores the first block, we try pushing it */
static inline int __try_push(struct zio_bi *bi, struct zio_channel *chan,
struct zio_block *block)
{
struct zio_ti *ti = chan->cset->ti;
int pushed;
/* chek if trigger is disabled */
if (unlikely((ti->flags & ZIO_STATUS) == ZIO_DISABLED))
return 0;
/*
* If push succeeds and the device eats data immediately,
* the trigger may call retr_block right now. So
* release the lock but also say we can't retrieve now.
*/
bi->flags |= ZIO_BI_PUSHING;
spin_unlock(&bi->lock);
pushed = (ti->t_op->push_block(ti, chan, block) == 0);
spin_lock(&bi->lock);
bi->flags &= ~ZIO_BI_PUSHING;
return pushed;
}
/* Store is called by the trigger (for input) or by f->write (for output) */
static int zbk_store_block(struct zio_bi *bi, struct zio_block *block)
{
......@@ -218,7 +195,7 @@ static int zbk_store_block(struct zio_bi *bi, struct zio_block *block)
list_add_tail(&item->list, &zbki->list);
if (first) {
if (unlikely(output))
pushed = __try_push(bi, chan, block);
pushed = zio_trigger_try_push(bi, chan, block);
else
awake = 1;
}
......
include/linux/zio-trigger.h
View file @ 216e8787
......@@ -162,4 +162,30 @@ static inline void zio_generic_data_done(struct zio_cset *cset)
chan->active_block = zio_buffer_retr_block(chan->bi);
}
/**
* This helper try to push a block to the trigger
*/
static inline int zio_trigger_try_push(struct zio_bi *bi,
struct zio_channel *chan,
struct zio_block *block)
{
struct zio_ti *ti = chan->cset->ti;
int pushed;
/* chek if trigger is disabled */
if (unlikely((ti->flags & ZIO_STATUS) == ZIO_DISABLED))
return 0;
/*
* If push succeeds and the device eats data immediately,
* the trigger may call retr_block right now. So
* release the lock but also say we can't retrieve now.
*/
bi->flags |= ZIO_BI_PUSHING;
spin_unlock(&bi->lock); /* Don't irqrestore here, keep them disabled */
pushed = (ti->t_op->push_block(ti, chan, block) == 0);
spin_lock(&bi->lock);
bi->flags &= ~ZIO_BI_PUSHING;
return pushed;
}
#endif /* __ZIO_TRIGGER_H__ */
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