From: Filipe Manana Date: Wed, 26 Nov 2014 15:28:55 +0000 (+0000) Subject: Btrfs: make btrfs_abort_transaction consider existence of new block groups X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c92f6be34c501406daf5e61f3569a1813f985393;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Btrfs: make btrfs_abort_transaction consider existence of new block groups If the transaction handle doesn't have used blocks but has created new block groups make sure we turn the fs into readonly mode too. This is because the new block groups didn't get all their metadata persisted into the chunk and device trees, and therefore if a subsequent transaction starts, allocates space from the new block groups, writes data or metadata into that space, commits successfully and then after we unmount and mount the filesystem again, the same space can be allocated again for a new block group, resulting in file data or metadata corruption. Example where we don't abort the transaction when we fail to finish the chunk allocation (add items to the chunk and device trees) and later a future transaction where the block group is removed fails because it can't find the chunk item in the chunk tree: [25230.404300] WARNING: CPU: 0 PID: 7721 at fs/btrfs/super.c:260 __btrfs_abort_transaction+0x50/0xfc [btrfs]() [25230.404301] BTRFS: Transaction aborted (error -28) [25230.404302] Modules linked in: btrfs dm_flakey nls_utf8 fuse xor raid6_pq ntfs vfat msdos fat xfs crc32c_generic libcrc32c ext3 jbd ext2 dm_mod nfsd auth_rpcgss oid_registry nfs_acl nfs lockd fscache sunrpc loop psmouse i2c_piix4 i2ccore parport_pc parport processor button pcspkr serio_raw thermal_sys evdev microcode ext4 crc16 jbd2 mbcache sr_mod cdrom ata_generic sg sd_mod crc_t10dif crct10dif_generic crct10dif_common virtio_scsi floppy e1000 ata_piix libata virtio_pci virtio_ring scsi_mod virtio [last unloaded: btrfs] [25230.404325] CPU: 0 PID: 7721 Comm: xfs_io Not tainted 3.17.0-rc5-btrfs-next-1+ #1 [25230.404326] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.7.5-0-ge51488c-20140602_164612-nilsson.home.kraxel.org 04/01/2014 [25230.404328] 0000000000000000 ffff88004581bb08 ffffffff813e7a13 ffff88004581bb50 [25230.404330] ffff88004581bb40 ffffffff810423aa ffffffffa049386a 00000000ffffffe4 [25230.404332] ffffffffa05214c0 000000000000240c ffff88010fc8f800 ffff88004581bba8 [25230.404334] Call Trace: [25230.404338] [] dump_stack+0x45/0x56 [25230.404342] [] warn_slowpath_common+0x7f/0x98 [25230.404351] [] ? __btrfs_abort_transaction+0x50/0xfc [btrfs] [25230.404353] [] warn_slowpath_fmt+0x48/0x50 [25230.404362] [] __btrfs_abort_transaction+0x50/0xfc [btrfs] [25230.404374] [] btrfs_create_pending_block_groups+0x10c/0x135 [btrfs] [25230.404387] [] __btrfs_end_transaction+0x7e/0x2de [btrfs] [25230.404398] [] btrfs_end_transaction+0x10/0x12 [btrfs] [25230.404408] [] btrfs_check_data_free_space+0x111/0x1f0 [btrfs] [25230.404421] [] __btrfs_buffered_write+0x160/0x48d [btrfs] [25230.404425] [] ? cap_inode_need_killpriv+0x2d/0x37 [25230.404429] [] ? get_page+0x1a/0x2b [25230.404441] [] btrfs_file_write_iter+0x321/0x42f [btrfs] [25230.404443] [] ? handle_mm_fault+0x7f3/0x846 [25230.404446] [] ? mutex_unlock+0x16/0x18 [25230.404449] [] new_sync_write+0x7c/0xa0 [25230.404450] [] vfs_write+0xb0/0x112 [25230.404452] [] SyS_pwrite64+0x66/0x84 [25230.404454] [] system_call_fastpath+0x16/0x1b [25230.404455] ---[ end trace 5aa5684fdf47ab38 ]--- [25230.404458] BTRFS warning (device sdc): btrfs_create_pending_block_groups:9228: Aborting unused transaction(No space left). [25288.084814] BTRFS: error (device sdc) in btrfs_free_chunk:2509: errno=-2 No such entry (Failed lookup while freeing chunk.) Signed-off-by: Filipe Manana Reviewed-by: Josef Bacik Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index dbc115a25798..1b85cf503aec 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -9198,9 +9198,8 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans, int ret = 0; list_for_each_entry_safe(block_group, tmp, &trans->new_bgs, bg_list) { - list_del_init(&block_group->bg_list); if (ret) - continue; + goto next; spin_lock(&block_group->lock); memcpy(&item, &block_group->item, sizeof(item)); @@ -9215,6 +9214,8 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans, key.objectid, key.offset); if (ret) btrfs_abort_transaction(trans, extent_root, ret); +next: + list_del_init(&block_group->bg_list); } } diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 391ec4418460..60f7cbe815e9 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -262,7 +262,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, trans->aborted = errno; /* Nothing used. The other threads that have joined this * transaction may be able to continue. */ - if (!trans->blocks_used) { + if (!trans->blocks_used && list_empty(&trans->new_bgs)) { const char *errstr; errstr = btrfs_decode_error(errno);