call_usermodehelper() should wait for process

As of Linux 3.4 the UMH_WAIT_* constants were renumbered.  In
particular, the meaning of "1" changed from UMH_WAIT_PROC (wait for
process to complete), to UMH_WAIT_EXEC (wait for the exec, but not the
process).  A number of call sites used the number 1 instead of the
constant name, so the behavior was not as expected on kernels with
this change.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Ned Bass
2013-01-09 16:09:47 -08:00
committed by Brian Behlendorf
parent 42b3ce622f
commit 8842263bd0
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -166,7 +166,7 @@ splat_linux_drop_slab(struct file *file)
NULL };
int rc;
rc = call_usermodehelper(argv[0], argv, envp, 1);
rc = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
if (rc)
splat_vprint(file, SPLAT_LINUX_TEST3_NAME,
"Failed user helper '%s %s %s', rc = %d\n",
+1 -1
View File
@@ -75,7 +75,7 @@ splat_vnode_user_cmd(struct file *file, void *arg,
NULL };
int rc;
rc = call_usermodehelper(sh_path, argv, envp, 1);
rc = call_usermodehelper(sh_path, argv, envp, UMH_WAIT_PROC);
if (rc) {
splat_vprint(file, name,
"Failed command: %s %s %s (%d)\n",