summaryrefslogtreecommitdiff
path: root/fs/gfs2/file.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2011-08-05 10:12:47 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2011-10-21 12:39:25 +0100
commitf18185291d605ea9e442e00e2cf6c917a84d9837 (patch)
tree27c3148fcce8de4d52dba528fd788e6c2059c9c8 /fs/gfs2/file.c
parent40ac218f52aa5cac7dc8082f28b61c8b2b29373c (diff)
GFS2: Fix bug trap and journaled data fsync
Journaled data requires that a complete flush of all dirty data for the file is done, in order that the ail flush which comes after will succeed. Also the recently enhanced bug trap can trigger falsely in case an ail flush from fsync races with a page read. This updates the bug trap such that it will ignore buffers which are locked and only trigger on dirty and/or pinned buffers when the ail flush is run from fsync. The original bug trap is retained when ail flush is run from ->go_sync() Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/file.c')
-rw-r--r--fs/gfs2/file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 92c3db424b40..9d12286d8111 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -590,6 +590,8 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end,
mutex_unlock(&inode->i_mutex);
return ret;
}
+ if (gfs2_is_jdata(ip))
+ filemap_write_and_wait(mapping);
gfs2_ail_flush(ip->i_gl);
mutex_unlock(&inode->i_mutex);
}