From f5dcfbf865bcbae09d53996229174b7b99c52bdf Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 7 Aug 2009 13:47:08 -0400 Subject: [PATCH] --- yaml --- r: 156510 b: refs/heads/master c: 4baf8c9201e88546918cbfa61ea8062c38bc1644 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eaffc658d01a..374f095bb58e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 013f1b12f4fc479f697acae2f31bad220162cd03 +refs/heads/master: 4baf8c9201e88546918cbfa61ea8062c38bc1644 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 3ea827ddf0fe..04b53b5ebe59 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -4806,8 +4806,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);