|
@@ -3370,6 +3370,8 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size)
|
|
|
|
|
|
static int btrfs_setsize(struct inode *inode, loff_t newsize)
|
|
|
{
|
|
|
+ struct btrfs_root *root = BTRFS_I(inode)->root;
|
|
|
+ struct btrfs_trans_handle *trans;
|
|
|
loff_t oldsize = i_size_read(inode);
|
|
|
int ret;
|
|
|
|
|
@@ -3377,16 +3379,20 @@ static int btrfs_setsize(struct inode *inode, loff_t newsize)
|
|
|
return 0;
|
|
|
|
|
|
if (newsize > oldsize) {
|
|
|
- i_size_write(inode, newsize);
|
|
|
- btrfs_ordered_update_i_size(inode, i_size_read(inode), NULL);
|
|
|
truncate_pagecache(inode, oldsize, newsize);
|
|
|
ret = btrfs_cont_expand(inode, oldsize, newsize);
|
|
|
- if (ret) {
|
|
|
- btrfs_setsize(inode, oldsize);
|
|
|
+ if (ret)
|
|
|
return ret;
|
|
|
- }
|
|
|
|
|
|
- mark_inode_dirty(inode);
|
|
|
+ trans = btrfs_start_transaction(root, 1);
|
|
|
+ if (IS_ERR(trans))
|
|
|
+ return PTR_ERR(trans);
|
|
|
+
|
|
|
+ i_size_write(inode, newsize);
|
|
|
+ btrfs_ordered_update_i_size(inode, i_size_read(inode), NULL);
|
|
|
+ ret = btrfs_update_inode(trans, root, inode);
|
|
|
+
|
|
|
+ btrfs_end_transaction_throttle(trans, root);
|
|
|
} else {
|
|
|
|
|
|
/*
|