lkml.org 
[lkml]   [2013]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 37/44] tty: Drop ldsem wait type
    Date
    Now the lock failures are handled independently for reads and
    writes, the wait flags are no longer necessary.

    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    ---
    drivers/tty/tty_ldsem.c | 19 ++-----------------
    1 file changed, 2 insertions(+), 17 deletions(-)

    diff --git a/drivers/tty/tty_ldsem.c b/drivers/tty/tty_ldsem.c
    index d849fb85..ddfbdfe 100644
    --- a/drivers/tty/tty_ldsem.c
    +++ b/drivers/tty/tty_ldsem.c
    @@ -76,9 +76,6 @@
    struct ldsem_waiter {
    struct list_head list;
    struct task_struct *task;
    - unsigned int flags;
    -#define LDSEM_READ_WAIT 0x00000001
    -#define LDSEM_WRITE_WAIT 0x00000002
    };

    /* Wake types for __ldsem_wake(). Note: RWSEM_WAKE_NO_CHECK implies
    @@ -226,19 +223,13 @@ static struct ld_semaphore __sched *
    down_read_failed(struct ld_semaphore *sem, long timeout)
    {
    struct ldsem_waiter waiter;
    - long flags = LDSEM_READ_WAIT;
    long adjust = -LDSEM_ACTIVE_BIAS + LDSEM_WAIT_BIAS;

    /* set up my own style of waitqueue */
    raw_spin_lock_irq(&sem->wait_lock);
    -
    - if (flags & LDSEM_READ_WAIT)
    - list_add_tail(&waiter.list, &sem->read_wait);
    - else
    - list_add_tail(&waiter.list, &sem->write_wait);
    + list_add_tail(&waiter.list, &sem->read_wait);

    waiter.task = current;
    - waiter.flags = flags;
    get_task_struct(current);

    /* change the lock attempt to a wait --
    @@ -287,19 +278,13 @@ static struct ld_semaphore __sched *
    down_write_failed(struct ld_semaphore *sem, long timeout)
    {
    struct ldsem_waiter waiter;
    - long flags = LDSEM_WRITE_WAIT;
    long adjust = -LDSEM_ACTIVE_BIAS;

    /* set up my own style of waitqueue */
    raw_spin_lock_irq(&sem->wait_lock);
    -
    - if (flags & LDSEM_READ_WAIT)
    - list_add_tail(&waiter.list, &sem->read_wait);
    - else
    - list_add_tail(&waiter.list, &sem->write_wait);
    + list_add_tail(&waiter.list, &sem->write_wait);

    waiter.task = current;
    - waiter.flags = flags;
    get_task_struct(current);

    /* change the lock attempt to a wait --
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-03-11 23:02    [W:4.205 / U:0.380 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site