mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: btrfs: fix oops when doing space balance Btrfs: don't panic if we get an error while balancing V2 btrfs: add missing options displayed in mount output
This commit is contained in:
commit
1acc9309eb
4 changed files with 20 additions and 6 deletions
|
@ -1335,6 +1335,11 @@ struct btrfs_ioctl_defrag_range_args {
|
|||
*/
|
||||
#define BTRFS_STRING_ITEM_KEY 253
|
||||
|
||||
/*
|
||||
* Flags for mount options.
|
||||
*
|
||||
* Note: don't forget to add new options to btrfs_show_options()
|
||||
*/
|
||||
#define BTRFS_MOUNT_NODATASUM (1 << 0)
|
||||
#define BTRFS_MOUNT_NODATACOW (1 << 1)
|
||||
#define BTRFS_MOUNT_NOBARRIER (1 << 2)
|
||||
|
|
|
@ -2678,12 +2678,14 @@ noinline int btrfs_update_inode(struct btrfs_trans_handle *trans,
|
|||
int ret;
|
||||
|
||||
/*
|
||||
* If root is tree root, it means this inode is used to
|
||||
* store free space information. And these inodes are updated
|
||||
* when committing the transaction, so they needn't delaye to
|
||||
* be updated, or deadlock will occured.
|
||||
* If the inode is a free space inode, we can deadlock during commit
|
||||
* if we put it into the delayed code.
|
||||
*
|
||||
* The data relocation inode should also be directly updated
|
||||
* without delay
|
||||
*/
|
||||
if (!is_free_space_inode(root, inode)) {
|
||||
if (!is_free_space_inode(root, inode)
|
||||
&& root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID) {
|
||||
ret = btrfs_delayed_update_inode(trans, root, inode);
|
||||
if (!ret)
|
||||
btrfs_set_inode_last_trans(trans, inode);
|
||||
|
|
|
@ -723,6 +723,12 @@ static int btrfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
|
|||
seq_puts(seq, ",clear_cache");
|
||||
if (btrfs_test_opt(root, USER_SUBVOL_RM_ALLOWED))
|
||||
seq_puts(seq, ",user_subvol_rm_allowed");
|
||||
if (btrfs_test_opt(root, ENOSPC_DEBUG))
|
||||
seq_puts(seq, ",enospc_debug");
|
||||
if (btrfs_test_opt(root, AUTO_DEFRAG))
|
||||
seq_puts(seq, ",autodefrag");
|
||||
if (btrfs_test_opt(root, INODE_MAP_CACHE))
|
||||
seq_puts(seq, ",inode_cache");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -2098,7 +2098,8 @@ int btrfs_balance(struct btrfs_root *dev_root)
|
|||
chunk_root->root_key.objectid,
|
||||
found_key.objectid,
|
||||
found_key.offset);
|
||||
BUG_ON(ret && ret != -ENOSPC);
|
||||
if (ret && ret != -ENOSPC)
|
||||
goto error;
|
||||
key.offset = found_key.offset - 1;
|
||||
}
|
||||
ret = 0;
|
||||
|
|
Loading…
Reference in a new issue