diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-04 04:36:46 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-04 04:36:46 (GMT) |
| commit | 0e76a3a587fc7abda2badf249053b427baad255e (patch) | |
| tree | 646a1da67dc25654552028225ca4b7a0a8043cc9 /drivers/md/bcache/closure.c | |
| parent | fba3679d34511c42bf452e89dda457a1219eb43a (diff) | |
| parent | 72a67a94bcba71a5fddd6b3596a20604d2b5dcd6 (diff) | |
| download | linux-fsl-qoriq-0e76a3a587fc7abda2badf249053b427baad255e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next to setup some infrastructure Eric
Dumazet needs for usbnet changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/md/bcache/closure.c')
| -rw-r--r-- | drivers/md/bcache/closure.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/bcache/closure.c b/drivers/md/bcache/closure.c index bd05a9a..9aba201 100644 --- a/drivers/md/bcache/closure.c +++ b/drivers/md/bcache/closure.c @@ -66,16 +66,18 @@ static inline void closure_put_after_sub(struct closure *cl, int flags) } else { struct closure *parent = cl->parent; struct closure_waitlist *wait = closure_waitlist(cl); + closure_fn *destructor = cl->fn; closure_debug_destroy(cl); + smp_mb(); atomic_set(&cl->remaining, -1); if (wait) closure_wake_up(wait); - if (cl->fn) - cl->fn(cl); + if (destructor) + destructor(cl); if (parent) closure_put(parent); |