From 1ea7e413480cde46cef76f7d7a569f69c81e9919 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 30 Jan 2013 14:31:31 -0500 Subject: [PATCH] --- yaml --- r: 349606 b: refs/heads/master c: 59fe4f41976f6331b695ff049296d082cf621823 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/ordered-data.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c8c9dc61c920..1f50d28abfa6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d1f40202bad12d4c70a2d40a420b30d23a72b1a +refs/heads/master: 59fe4f41976f6331b695ff049296d082cf621823 diff --git a/trunk/fs/btrfs/ordered-data.c b/trunk/fs/btrfs/ordered-data.c index fc6840b53d9d..e5ed56729607 100644 --- a/trunk/fs/btrfs/ordered-data.c +++ b/trunk/fs/btrfs/ordered-data.c @@ -877,7 +877,7 @@ int btrfs_ordered_update_i_size(struct inode *inode, u64 offset, break; if (test->file_offset >= i_size) break; - if (test->file_offset >= disk_i_size) { + if (entry_end(test) > disk_i_size) { /* * we don't update disk_i_size now, so record this * undealt i_size. Or we will not know the real