[PATCH 1/6] usermodehelper: introduce umh_complete(sub_info)

From: Oleg Nesterov
Date: Tue Feb 14 2012 - 11:54:24 EST


Preparation. Add the new trivial helper, umh_complete(). Currently
it simply does complete(sub_info->complete).

Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
---
kernel/kmod.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kernel/kmod.c b/kernel/kmod.c
index a0a8854..8ea2594 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -199,6 +199,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)
{
@@ -235,7 +240,7 @@ static int wait_for_helper(void *data)
sub_info->retval = ret;
}

- complete(sub_info->complete);
+ umh_complete(sub_info);
return 0;
}

@@ -269,7 +274,7 @@ static void __call_usermodehelper(struct work_struct *work)
case UMH_WAIT_EXEC:
if (pid < 0)
sub_info->retval = pid;
- complete(sub_info->complete);
+ umh_complete(sub_info);
}
}

--
1.5.5.1


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