diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:31:37 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:31:37 -0400 |
| commit | 1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225 (patch) | |
| tree | a7dde6312ec24eb6368cad7a3efedbf368a5a70c /fs/btrfs/async-thread.h | |
| parent | b5d67f64f9bc656970dacba245410f0faedad18e (diff) | |
| parent | 65139ed99234d8505948cdb7a835452eb5c191f9 (diff) | |
Merge branch 'error-handling' into for-linus
Conflicts:
fs/btrfs/ctree.c
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/inode.c
fs/btrfs/scrub.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/async-thread.h')
| -rw-r--r-- | fs/btrfs/async-thread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/async-thread.h b/fs/btrfs/async-thread.h index f34cc31fa3c9..063698b90ce2 100644 --- a/fs/btrfs/async-thread.h +++ b/fs/btrfs/async-thread.h @@ -111,9 +111,9 @@ struct btrfs_workers { void btrfs_queue_worker(struct btrfs_workers *workers, struct btrfs_work *work); int btrfs_start_workers(struct btrfs_workers *workers); -int btrfs_stop_workers(struct btrfs_workers *workers); +void btrfs_stop_workers(struct btrfs_workers *workers); void btrfs_init_workers(struct btrfs_workers *workers, char *name, int max, struct btrfs_workers *async_starter); -int btrfs_requeue_work(struct btrfs_work *work); +void btrfs_requeue_work(struct btrfs_work *work); void btrfs_set_work_high_prio(struct btrfs_work *work); #endif |