diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:03:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:03:09 -0700 |
| commit | d6a0967c90dced0a8baf502e6f3d5862fd5a5805 (patch) | |
| tree | e0242d5077730dabc4102b7abad9ee0c41e33bc0 /fs/btrfs/inode.c | |
| parent | fb385003c4ac9634cf2448f6ded81e5fd1190c1f (diff) | |
| parent | ceab36edd3d3ad3ffd01d41d6d1e05ac1ff8357e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: fix balancing oops when invalidate_inode_pages2 returns EBUSY
Btrfs: correct error-handling zlib error handling
Btrfs: remove superfluous NULL pointer check in btrfs_rename()
Btrfs: make sure the async caching thread advances the key
Btrfs: fix btrfs_remove_from_free_space corner case
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 56fe83fa60c..272b9b2bea8 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4785,8 +4785,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, * and the replacement file is large. Start IO on it now so * we don't add too much work to the end of the transaction */ - if (new_inode && old_inode && S_ISREG(old_inode->i_mode) && - new_inode->i_size && + if (new_inode && S_ISREG(old_inode->i_mode) && new_inode->i_size && old_inode->i_size > BTRFS_ORDERED_OPERATIONS_FLUSH_LIMIT) filemap_flush(old_inode->i_mapping); |