Fix disk_i_size update corner case.
PATCH 4/8 Fix disk_i_size update corner case.
There are some cases file extents are inserted without involving ordered struct. In these cases, we update disk_i_size directly, without checking pending ordered extent and DELALLOC bit. This patch extends btrfs_ordered_update_i_size() to handle these cases.
Signed-off-by Yan Zheng <[email protected]>
---
fs/btrfs/btrfs_inode.h +0 -3
@@ -44,9 +44,6 @@ struct btrfs_inode {*/ struct extent_io_tree io_failure_tree; -/* held while inesrting or deleting extents from files */ -struct mutex extent_mutex; -/* held while logging the inode in tree-log.c */ struct mutex log_mutex;
fs/btrfs/inode.c +21 -14
@@ -188,8 +188,9 @@ static noinline int insert_inline_extentbtrfs_mark_buffer_dirty (leaf);btrfs_free_path (path); -BTRFS_I (inode)->disk_i_size = inode->i_size; -btrfs_update_inode (trans, root, inode); +btrfs_ordered_update_i_size (inode, start + size,NULL ); + ret =btrfs_update_inode (trans, root, inode); +BUG_ON (ret);return 0 ; fail:btrfs_free_path (path);
@@ -1698,18 +1699,27 @@ static int btrfs_finish_ordered_io(struc } } - trans =btrfs_join_transaction (root,1 ); -if (!ordered_extent) ordered_extent =btrfs_lookup_ordered_extent (inode, start);BUG_ON (!ordered_extent); -if (test_bit (BTRFS_ORDERED_NOCOW , &ordered_extent->flags)) - goto nocow; +if (test_bit (BTRFS_ORDERED_NOCOW , &ordered_extent->flags)) { +BUG_ON (!list_empty (&ordered_extent->list)); + ret =btrfs_ordered_update_i_size (inode,0 , ordered_extent); +if (!ret) { + trans =btrfs_join_transaction (root,1 ); + ret =btrfs_update_inode (trans, root, inode); +BUG_ON (ret); +btrfs_end_transaction (trans, root); + } + goto out; + }lock_extent (io_tree, ordered_extent->file_offset, ordered_extent->file_offset + ordered_extent->len -1 ,GFP_NOFS ); + trans =btrfs_join_transaction (root,1 ); +if (test_bit (BTRFS_ORDERED_COMPRESSED , &ordered_extent->flags)) compressed =1 ;if (test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) {
@@ -1736,22 +1746,20 @@ static int btrfs_finish_ordered_io(strucunlock_extent (io_tree, ordered_extent->file_offset, ordered_extent->file_offset + ordered_extent->len -1 ,GFP_NOFS ); -nocow:add_pending_csums (trans, inode, ordered_extent->file_offset, &ordered_extent->list); -mutex_lock (&BTRFS_I (inode)->extent_mutex); -btrfs_ordered_update_i_size (inode, ordered_extent); -btrfs_update_inode (trans, root, inode); +btrfs_ordered_update_i_size (inode,0 , ordered_extent); + ret =btrfs_update_inode (trans, root, inode); +BUG_ON (ret); +btrfs_end_transaction (trans, root); +out:btrfs_remove_ordered_extent (inode, ordered_extent); -mutex_unlock (&BTRFS_I (inode)->extent_mutex); -/* once for us */ btrfs_put_ordered_extent (ordered_extent);/* once for the tree */ btrfs_put_ordered_extent (ordered_extent); -btrfs_end_transaction (trans, root);return 0 ; }
@@ -3510,7 +3518,6 @@ static noinline void init_btrfs_i(structINIT_LIST_HEAD (&BTRFS_I (inode)->ordered_operations);RB_CLEAR_NODE (&BTRFS_I (inode)->rb_node);btrfs_ordered_inode_tree_init (&BTRFS_I (inode)->ordered_tree); -mutex_init (&BTRFS_I (inode)->extent_mutex);mutex_init (&BTRFS_I (inode)->log_mutex); }
fs/btrfs/ordered-data.c +40 -17
118 lines not on this page · raw message
fs/btrfs/ordered-data.h +1 -1
@@ -150,7 +150,7 @@ void btrfs_start_ordered_extent(struct iint btrfs_wait_ordered_range (struct inode *inode,u64 start,u64 len);struct btrfs_ordered_extent *btrfs_lookup_first_ordered_extent (struct inode * inode,u64 file_offset); -int btrfs_ordered_update_i_size (struct inode *inode, +int btrfs_ordered_update_i_size (struct inode *inode,u64 offset,struct btrfs_ordered_extent *ordered);int btrfs_find_ordered_sum (struct inode *inode,u64 offset,u64 disk_bytenr,u32 *sum); int btrfs_wait_on_page_writeback_range(struct address_space *mapping,