| Message ID | 1359574114-1804-1-git-send-email-jbacik@fusionio.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jan 30, 2013 at 11:28 AM, Josef Bacik <jbacik@fusionio.com> wrote: > + /* > + * We still need to update disk_i_size if outstanding_isize is greater > + * than disk_i_size. > + */ > + if (offset <= disk_i_size && > + (!ordered || ordered->outstanding_isize < disk_i_size)) "<=" for the comparison? "ordered->outstanding_isize <= disk_i_size" Cheers, Filipe -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jan 30, 2013 at 12:36:22PM -0700, Filipe Brandenburger wrote: > On Wed, Jan 30, 2013 at 11:28 AM, Josef Bacik <jbacik@fusionio.com> wrote: > > + /* > > + * We still need to update disk_i_size if outstanding_isize is greater > > + * than disk_i_size. > > + */ > > + if (offset <= disk_i_size && > > + (!ordered || ordered->outstanding_isize < disk_i_size)) > > "<=" for the comparison? "ordered->outstanding_isize <= disk_i_size" > Yeah good point. Thanks, Josef -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index cbd4838..c447e4c 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c @@ -895,9 +895,16 @@ int btrfs_ordered_update_i_size(struct inode *inode, u64 offset, * if the disk i_size is already at the inode->i_size, or * this ordered extent is inside the disk i_size, we're done */ - if (disk_i_size == i_size || offset <= disk_i_size) { + if (disk_i_size == i_size) + goto out; + + /* + * We still need to update disk_i_size if outstanding_isize is greater + * than disk_i_size. + */ + if (offset <= disk_i_size && + (!ordered || ordered->outstanding_isize < disk_i_size)) goto out; - } /* * walk backward from this ordered extent to disk_i_size.
If we have an ordered extent before the ordered extent we are currently completing that is after the current disk_i_size we will put our i_size update into that ordered extent so that we do not expose stale data. The problem is that if our disk i_size is updated past the previous ordered extent we won't update the i_size with the pending i_size update. So check the pending i_size update and if its above the current disk i_size we need to go ahead and try to update. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> --- fs/btrfs/ordered-data.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)