diff options
| author | Ilya Dryomov <[email protected]> | 2013-03-06 08:57:55 +0000 |
|---|---|---|
| committer | Chris Mason <[email protected]> | 2013-03-07 03:03:16 +0000 |
| commit | 3a01aa7a25274308fe813a6237f678aed901cea3 (patch) | |
| tree | 121565712abd2b2d179548ad5dc5a1202a50593a /net/unix/af_unix.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/... (diff) | |
| download | kernel-3a01aa7a25274308fe813a6237f678aed901cea3.tar.gz kernel-3a01aa7a25274308fe813a6237f678aed901cea3.zip | |
Btrfs: fix a mismerge in btrfs_balance()
Raid56 merge (merge commit e942f88) had mistakenly removed a call to
__cancel_balance(), which resulted in balance not cleaning up after itself
after a successful finish. (Cleanup includes switching the state, removing
the balance item and releasing mut_ex_op testnset lock.) Bring it back.
Reported-by: David Sterba <[email protected]>
Signed-off-by: Ilya Dryomov <[email protected]>
Signed-off-by: Chris Mason <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions