summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 3d29505971fe..43eb4535319d 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -104,7 +104,7 @@ static void __endio_write_update_ordered(struct inode *inode,
104 104
105/* 105/*
106 * Cleanup all submitted ordered extents in specified range to handle errors 106 * Cleanup all submitted ordered extents in specified range to handle errors
107 * from the fill_dellaloc() callback. 107 * from the btrfs_run_delalloc_range() callback.
108 * 108 *
109 * NOTE: caller must ensure that when an error happens, it can not call 109 * NOTE: caller must ensure that when an error happens, it can not call
110 * extent_clear_unlock_delalloc() to clear both the bits EXTENT_DO_ACCOUNTING 110 * extent_clear_unlock_delalloc() to clear both the bits EXTENT_DO_ACCOUNTING
@@ -1842,7 +1842,7 @@ void btrfs_clear_delalloc_extent(struct inode *vfs_inode,
1842 1842
1843 /* 1843 /*
1844 * We don't reserve metadata space for space cache inodes so we 1844 * We don't reserve metadata space for space cache inodes so we
1845 * don't need to call dellalloc_release_metadata if there is an 1845 * don't need to call delalloc_release_metadata if there is an
1846 * error. 1846 * error.
1847 */ 1847 */
1848 if (*bits & EXTENT_CLEAR_META_RESV && 1848 if (*bits & EXTENT_CLEAR_META_RESV &&
@@ -4516,7 +4516,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
4516 /* 4516 /*
4517 * This function is also used to drop the items in the log tree before 4517 * This function is also used to drop the items in the log tree before
4518 * we relog the inode, so if root != BTRFS_I(inode)->root, it means 4518 * we relog the inode, so if root != BTRFS_I(inode)->root, it means
4519 * it is used to drop the loged items. So we shouldn't kill the delayed 4519 * it is used to drop the logged items. So we shouldn't kill the delayed
4520 * items. 4520 * items.
4521 */ 4521 */
4522 if (min_type == 0 && root == BTRFS_I(inode)->root) 4522 if (min_type == 0 && root == BTRFS_I(inode)->root)
@@ -5108,7 +5108,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
5108 5108
5109 truncate_setsize(inode, newsize); 5109 truncate_setsize(inode, newsize);
5110 5110
5111 /* Disable nonlocked read DIO to avoid the end less truncate */ 5111 /* Disable nonlocked read DIO to avoid the endless truncate */
5112 btrfs_inode_block_unlocked_dio(BTRFS_I(inode)); 5112 btrfs_inode_block_unlocked_dio(BTRFS_I(inode));
5113 inode_dio_wait(inode); 5113 inode_dio_wait(inode);
5114 btrfs_inode_resume_unlocked_dio(BTRFS_I(inode)); 5114 btrfs_inode_resume_unlocked_dio(BTRFS_I(inode));
@@ -8052,7 +8052,7 @@ static void __endio_write_update_ordered(struct inode *inode,
8052 return; 8052 return;
8053 /* 8053 /*
8054 * Our bio might span multiple ordered extents. In this case 8054 * Our bio might span multiple ordered extents. In this case
8055 * we keep goin until we have accounted the whole dio. 8055 * we keep going until we have accounted the whole dio.
8056 */ 8056 */
8057 if (ordered_offset < offset + bytes) { 8057 if (ordered_offset < offset + bytes) {
8058 ordered_bytes = offset + bytes - ordered_offset; 8058 ordered_bytes = offset + bytes - ordered_offset;