Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-03-12 10:51:22 -07:00
parent 9f94581aca b625eab814
commit d032066bf3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/zpios/zpios.c
View File

@ -270,6 +270,8 @@ zpios_setup_run(run_args_t **run_args, zpios_cmd_t *kcmd, struct file *file)
mutex_init(&ra->lock_work, NULL, MUTEX_DEFAULT, NULL); mutex_init(&ra->lock_work, NULL, MUTEX_DEFAULT, NULL);
mutex_init(&ra->lock_ctl, NULL, MUTEX_DEFAULT, NULL); mutex_init(&ra->lock_ctl, NULL, MUTEX_DEFAULT, NULL);
(void)zpios_upcall(ra->pre, PHASE_PRE_RUN, ra, 0);
rc = zpios_dmu_setup(ra); rc = zpios_dmu_setup(ra);
if (rc) { if (rc) {
mutex_destroy(&ra->lock_ctl); mutex_destroy(&ra->lock_ctl);
@ -799,7 +801,7 @@ static int
zpios_do_one_run(struct file *file, zpios_cmd_t *kcmd, zpios_do_one_run(struct file *file, zpios_cmd_t *kcmd,
int data_size, void *data) int data_size, void *data)
{ {
run_args_t *run_args; run_args_t *run_args = { 0 };
zpios_stats_t *stats = (zpios_stats_t *)data; zpios_stats_t *stats = (zpios_stats_t *)data;
int i, n, m, size, rc; int i, n, m, size, rc;
@ -843,8 +845,6 @@ zpios_do_one_run(struct file *file, zpios_cmd_t *kcmd,
return -ENOSPC; return -ENOSPC;
} }
(void)zpios_upcall(kcmd->cmd_pre, PHASE_PRE_RUN, run_args, 0);
rc = zpios_setup_run(&run_args, kcmd, file); rc = zpios_setup_run(&run_args, kcmd, file);
if (rc) if (rc)
return rc; return rc;