]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 29bfae4) | patch
Btrfs: fix a mismerge in btrfs_balance()
authorIlya Dryomov <idryomov@gmail.com>
Wed, 6 Mar 2013 08:57:55 +0000 (01:57 -0700)
committerChris Mason <chris.mason@fusionio.com>
Thu, 7 Mar 2013 03:03:16 +0000 (22:03 -0500)
commitf24d9e29cc4389b11ebb263314a4982a56b14964
tree121565712abd2b2d179548ad5dc5a1202a50593atree | snapshot
parent29bfae4efb05bc01b8b7cf7007e01ce0f5163dd2commit | diff
Btrfs: fix a mismerge in btrfs_balance()

Raid56 merge (merge commit 69684ff) 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>
fs/btrfs/volumes.c diff | blob | history
Linux Kernel Source Tree.