Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be6aef60 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: Use btrfs_update_inode_fallback when creating a snapshot 



On a really full file system I was getting ENOSPC back from
btrfs_update_inode when trying to update the parent inode when creating a
snapshot.  Just use the fallback method so we can update the inode and not
have to worry about having a delayed ref.  Thanks,

Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent e2d044fe

fs/btrfs/ctree.h

+2 −0
Original line number Diff line number Diff line
@@ -3338,6 +3338,8 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page, 
int btrfs_update_inode(struct btrfs_trans_handle *trans,

			      struct btrfs_root *root,

			      struct inode *inode);

int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,

				struct btrfs_root *root, struct inode *inode);

int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode);

int btrfs_orphan_del(struct btrfs_trans_handle *trans, struct inode *inode);

int btrfs_orphan_cleanup(struct btrfs_root *root);

fs/btrfs/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ static noinline int cow_file_range(struct inode *inode, 
				   struct page *locked_page,

				   u64 start, u64 end, int *page_started,

				   unsigned long *nr_written, int unlock);

static noinline int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,

				struct btrfs_root *root, struct inode *inode);



static int btrfs_init_inode_security(struct btrfs_trans_handle *trans,

				     struct inode *inode,  struct inode *dir,
@@ -2746,8 +2744,9 @@ noinline int btrfs_update_inode(struct btrfs_trans_handle *trans, 
	return btrfs_update_inode_item(trans, root, inode);

}



static noinline int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,

				struct btrfs_root *root, struct inode *inode)

noinline int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,

					 struct btrfs_root *root,

					 struct inode *inode)

{

	int ret;

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 
	btrfs_i_size_write(parent_inode, parent_inode->i_size +

					 dentry->d_name.len * 2);

	parent_inode->i_mtime = parent_inode->i_ctime = CURRENT_TIME;

	ret = btrfs_update_inode(trans, parent_root, parent_inode);

	ret = btrfs_update_inode_fallback(trans, parent_root, parent_inode);

	if (ret)

		btrfs_abort_transaction(trans, root, ret);

fail: