Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45843
b: refs/heads/master
c: f94b347
h: refs/heads/master
i:
  45841: 0bfdbca
  45839: 248a152
v: v3
  • Loading branch information
Eric Van Hensbergen authored and Linus Torvalds committed Jan 26, 2007
1 parent fe00f6d commit 6ecc2e3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f49d5e62d9352d33b30c9befbaf0fd9c88265ec1
refs/heads/master: f94b347059809aecd97af53a084fe5f3db045d92
4 changes: 3 additions & 1 deletion trunk/fs/9p/mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,10 @@ int v9fs_mux_global_init(void)
v9fs_mux_poll_tasks[i].task = NULL;

v9fs_mux_wq = create_workqueue("v9fs");
if (!v9fs_mux_wq)
if (!v9fs_mux_wq) {
printk(KERN_WARNING "v9fs: mux: creating workqueue failed\n");
return -ENOMEM;
}

return 0;
}
Expand Down
11 changes: 8 additions & 3 deletions trunk/fs/9p/v9fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -457,14 +457,19 @@ static int __init init_v9fs(void)

v9fs_error_init();

printk(KERN_INFO "Installing v9fs 9P2000 file system support\n");
printk(KERN_INFO "Installing v9fs 9p2000 file system support\n");

ret = v9fs_mux_global_init();
if (!ret)
if (ret) {
printk(KERN_WARNING "v9fs: starting mux failed\n");
return ret;
}
ret = register_filesystem(&v9fs_fs_type);
if (!ret)
if (ret) {
printk(KERN_WARNING "v9fs: registering file system failed\n");
v9fs_mux_global_exit();
}

return ret;
}

Expand Down

0 comments on commit 6ecc2e3

Please sign in to comment.