diff options
| author |   Ilya Dryomov <idryomov@gmail.com> | 2013-03-06 01:57:55 -0700 |
|---|---|---|
| committer |   Chris Mason <chris.mason@fusionio.com> | 2013-03-06 22:03:16 -0500 |
| 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/btrfs-next into for-linus-3.9 (diff) | |
| download | wireguard-linux-3a01aa7a25274308fe813a6237f678aed901cea3.tar.xz wireguard-linux-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 <dsterba@suse.cz>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions