On Tue, 2013-06-04 at 19:21 +0200, Willy Tarreau wrote: > 2.6.32-longterm review patch. If anyone has any objections, please let me > know. > > ------------------ > > From: Oleg Nesterov <[email protected]> > > commit b3449922502f5a161ee2b5022a33aec8472fbf18 upstream > > Preparation. Add the new trivial helper, umh_complete(). Currently it > simply does complete(sub_info->complete). > > Signed-off-by: Oleg Nesterov <[email protected]> > Cc: Tetsuo Handa <[email protected]> > Cc: Rusty Russell <[email protected]> > Cc: Tejun Heo <[email protected]> > Cc: David Rientjes <[email protected]> > Signed-off-by: Andrew Morton <[email protected]> > Signed-off-by: Linus Torvalds <[email protected]> > [dannf: Adjusted to apply to Debian's 2.6.32]
Dann's backports are mostly missing his Signed-off-by. (We don't usually bother with this in the Debian patch queue, but probably ought to do so when backporting.) Ben. > Signed-off-by: Willy Tarreau <[email protected]> > --- > kernel/kmod.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/kernel/kmod.c b/kernel/kmod.c > index a061472..2a27d17 100644 > --- a/kernel/kmod.c > +++ b/kernel/kmod.c > @@ -206,6 +206,11 @@ void call_usermodehelper_freeinfo(struct subprocess_info > *info) > } > EXPORT_SYMBOL(call_usermodehelper_freeinfo); > > +static void umh_complete(struct subprocess_info *sub_info) > +{ > + complete(sub_info->complete); > +} > + > /* Keventd can't block, but this (a child) can. */ > static int wait_for_helper(void *data) > { > @@ -245,7 +250,7 @@ static int wait_for_helper(void *data) > if (sub_info->wait == UMH_NO_WAIT) > call_usermodehelper_freeinfo(sub_info); > else > - complete(sub_info->complete); > + umh_complete(sub_info); > return 0; > } > > @@ -280,7 +285,7 @@ static void __call_usermodehelper(struct work_struct > *work) > /* FALLTHROUGH */ > > case UMH_WAIT_EXEC: > - complete(sub_info->complete); > + umh_complete(sub_info); > } > } > -- Ben Hutchings Theory and practice are closer in theory than in practice. - John Levine, moderator of comp.compilers
signature.asc
Description: This is a digitally signed message part
