projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'spi/fix/core' into spi-linus
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
async-thread.c
diff --git
a/fs/btrfs/async-thread.c
b/fs/btrfs/async-thread.c
index 08cc08f037a633199bffb3fadfa95750302eb25e..c1e0b0caf9cc975c2822cadf9aaaf0c1454dcf91 100644
(file)
--- a/
fs/btrfs/async-thread.c
+++ b/
fs/btrfs/async-thread.c
@@
-262,7
+262,7
@@
static struct btrfs_work *get_next_work(struct btrfs_worker_thread *worker,
struct btrfs_work *work = NULL;
struct list_head *cur = NULL;
struct btrfs_work *work = NULL;
struct list_head *cur = NULL;
- if(!list_empty(prio_head))
+ if
(!list_empty(prio_head))
cur = prio_head->next;
smp_mb();
cur = prio_head->next;
smp_mb();
@@
-495,6
+495,7
@@
static int __btrfs_start_workers(struct btrfs_workers *workers)
spin_lock_irq(&workers->lock);
if (workers->stopping) {
spin_unlock_irq(&workers->lock);
spin_lock_irq(&workers->lock);
if (workers->stopping) {
spin_unlock_irq(&workers->lock);
+ ret = -EINVAL;
goto fail_kthread;
}
list_add_tail(&worker->worker_list, &workers->idle_list);
goto fail_kthread;
}
list_add_tail(&worker->worker_list, &workers->idle_list);