|
@@ -565,8 +565,18 @@ restart:
|
|
|
* write. If zeroing is needed and we are currently holding the
|
|
|
* iolock shared, we need to update it to exclusive which implies
|
|
|
* having to redo all checks before.
|
|
|
+ *
|
|
|
+ * We need to serialise against EOF updates that occur in IO
|
|
|
+ * completions here. We want to make sure that nobody is changing the
|
|
|
+ * size while we do this check until we have placed an IO barrier (i.e.
|
|
|
+ * hold the XFS_IOLOCK_EXCL) that prevents new IO from being dispatched.
|
|
|
+ * The spinlock effectively forms a memory barrier once we have the
|
|
|
+ * XFS_IOLOCK_EXCL so we are guaranteed to see the latest EOF value
|
|
|
+ * and hence be able to correctly determine if we need to run zeroing.
|
|
|
*/
|
|
|
+ spin_lock(&ip->i_flags_lock);
|
|
|
if (*pos > i_size_read(inode)) {
|
|
|
+ spin_unlock(&ip->i_flags_lock);
|
|
|
if (*iolock == XFS_IOLOCK_SHARED) {
|
|
|
xfs_rw_iunlock(ip, *iolock);
|
|
|
*iolock = XFS_IOLOCK_EXCL;
|
|
@@ -576,7 +586,8 @@ restart:
|
|
|
error = xfs_zero_eof(ip, *pos, i_size_read(inode));
|
|
|
if (error)
|
|
|
return error;
|
|
|
- }
|
|
|
+ } else
|
|
|
+ spin_unlock(&ip->i_flags_lock);
|
|
|
|
|
|
/*
|
|
|
* Updating the timestamps will grab the ilock again from
|