|
@@ -331,7 +331,7 @@ static int ncp_parse_options(struct ncp_mount_data_kernel *data, char *options)
|
|
|
data->flags = 0;
|
|
|
data->int_flags = 0;
|
|
|
data->mounted_uid = 0;
|
|
|
- data->wdog_pid = -1;
|
|
|
+ data->wdog_pid = NULL;
|
|
|
data->ncp_fd = ~0;
|
|
|
data->time_out = 10;
|
|
|
data->retry_count = 20;
|
|
@@ -371,7 +371,7 @@ static int ncp_parse_options(struct ncp_mount_data_kernel *data, char *options)
|
|
|
data->flags = optint;
|
|
|
break;
|
|
|
case 'w':
|
|
|
- data->wdog_pid = optint;
|
|
|
+ data->wdog_pid = find_get_pid(optint);
|
|
|
break;
|
|
|
case 'n':
|
|
|
data->ncp_fd = optint;
|
|
@@ -425,7 +425,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
|
|
|
data.flags = md->flags;
|
|
|
data.int_flags = NCP_IMOUNT_LOGGEDIN_POSSIBLE;
|
|
|
data.mounted_uid = md->mounted_uid;
|
|
|
- data.wdog_pid = md->wdog_pid;
|
|
|
+ data.wdog_pid = find_get_pid(md->wdog_pid);
|
|
|
data.ncp_fd = md->ncp_fd;
|
|
|
data.time_out = md->time_out;
|
|
|
data.retry_count = md->retry_count;
|
|
@@ -445,7 +445,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
|
|
|
data.flags = md->flags;
|
|
|
data.int_flags = 0;
|
|
|
data.mounted_uid = md->mounted_uid;
|
|
|
- data.wdog_pid = md->wdog_pid;
|
|
|
+ data.wdog_pid = find_get_pid(md->wdog_pid);
|
|
|
data.ncp_fd = md->ncp_fd;
|
|
|
data.time_out = md->time_out;
|
|
|
data.retry_count = md->retry_count;
|
|
@@ -711,7 +711,8 @@ static void ncp_put_super(struct super_block *sb)
|
|
|
if (server->info_filp)
|
|
|
fput(server->info_filp);
|
|
|
fput(server->ncp_filp);
|
|
|
- kill_proc(server->m.wdog_pid, SIGTERM, 1);
|
|
|
+ kill_pid(server->m.wdog_pid, SIGTERM, 1);
|
|
|
+ put_pid(server->m.wdog_pid);
|
|
|
|
|
|
kfree(server->priv.data);
|
|
|
kfree(server->auth.object_name);
|