lkml.org 
[lkml]   [2006]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: md deadlock (was Re: 2.6.18-mm2)

    * Neil Brown <neilb@suse.de> wrote:

    > --- .prev/include/linux/mutex.h 2006-10-10 12:37:04.000000000 +1000
    > +++ ./include/linux/mutex.h 2006-10-10 12:40:20.000000000 +1000
    > @@ -125,8 +125,9 @@ extern int fastcall mutex_lock_interrupt
    >
    > #ifdef CONFIG_DEBUG_LOCK_ALLOC
    > extern void mutex_lock_nested(struct mutex *lock, unsigned int subclass);
    > +extern int mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass);
    > #else
    > -# define mutex_lock_nested(lock, subclass) mutex_lock(lock)
    > +# define mutex_lock_interruptible_nested(lock, subclass) mutex_interruptible_lock(lock)
    > #endif

    > EXPORT_SYMBOL_GPL(mutex_lock_nested);
    > +int __sched
    > +mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass)
    > +{
    > + might_sleep();
    > + return __mutex_lock_common(lock, TASK_INTERRUPTIBLE, subclass);
    > +}
    > +
    > +EXPORT_SYMBOL_GPL(mutex_lock_interruptible_nested);

    looks good to me. (small style nit: maybe insert a newline after the
    first EXPORT_SYMBOL_GPL line)

    Acked-by: Ingo Molnar <mingo@elte.hu>

    Ingo
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-10-10 08:53    [W:4.153 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site