summaryrefslogtreecommitdiffstats
path: root/fs/jfs/jfs_unicode.c
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2013-03-06 01:57:55 -0700
committerChris Mason <chris.mason@fusionio.com>2013-03-06 22:03:16 -0500
commit3a01aa7a25274308fe813a6237f678aed901cea3 (patch)
tree121565712abd2b2d179548ad5dc5a1202a50593a /fs/jfs/jfs_unicode.c
parent2cc65e3e57d636a159d92945655b1574e47dba63 (diff)
downloadblackbird-op-linux-3a01aa7a25274308fe813a6237f678aed901cea3.tar.gz
blackbird-op-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 'fs/jfs/jfs_unicode.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud