Hi,
On Mon, Jul 26, 2010 at 07:32:04PM +0200, Emilio Pozuelo Monfort wrote:
> @@ -159,14 +193,28 @@ diskfs_S_file_exec (struct protid *cred,
> do
> {
> right = ports_get_send_right (newpi);
> - err = exec_exec (execserver,
> - right, MACH_MSG_TYPE_COPY_SEND,
> - task, flags, argv, argvlen, envp, envplen,
> - fds, MACH_MSG_TYPE_COPY_SEND, fdslen,
> - portarray, MACH_MSG_TYPE_COPY_SEND, portarraylen,
> - intarray, intarraylen,
> - deallocnames, deallocnameslen,
> - destroynames, destroynameslen);
> + err = exec_exec_file_name (execserver,
> + right, MACH_MSG_TYPE_COPY_SEND,
> + task, flags, filename,
> + argv, argvlen, envp, envplen,
> + fds, MACH_MSG_TYPE_COPY_SEND, fdslen,
> + portarray, MACH_MSG_TYPE_COPY_SEND,
> + portarraylen,
> + intarray, intarraylen,
> + deallocnames, deallocnameslen,
> + destroynames, destroynameslen);
> + /* Fallback in case the exec server hasn't been restarted. */
Use the comment variant below.
> @@ -133,14 +167,29 @@ netfs_S_file_exec (struct protid *cred,
> if (newpi)
> {
> right = ports_get_send_right (newpi);
> - err = exec_exec (_netfs_exec,
> - right, MACH_MSG_TYPE_COPY_SEND,
> - task, flags, argv, argvlen, envp, envplen,
> - fds, MACH_MSG_TYPE_COPY_SEND, fdslen,
> - portarray, MACH_MSG_TYPE_COPY_SEND, portarraylen,
> - intarray, intarraylen,
> - deallocnames, deallocnameslen,
> - destroynames, destroynameslen);
> + err = exec_exec_file_name (_netfs_exec,
> + right, MACH_MSG_TYPE_COPY_SEND,
> + task, flags, filename,
> + argv, argvlen, envp, envplen,
> + fds, MACH_MSG_TYPE_COPY_SEND, fdslen,
> + portarray, MACH_MSG_TYPE_COPY_SEND,
> + portarraylen,
> + intarray, intarraylen,
> + deallocnames, deallocnameslen,
> + destroynames, destroynameslen);
> + /* For backwards compatibility. Just drop it when we kill
> + file_exec. */
Should be exec_exec instead of file_exec.
Regards,
Fredrik
