aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-10-01 02:38:51 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-10-02 09:02:54 -0400
commit930cc237d67dc62464fe71529631d16f51d7aee3 (patch)
treee91503bb49ac08244facc505e1791d620b6b0ef1 /fs
parent9c9eb21eee1790804ce407fd820f65be0b4fdd03 (diff)
[GFS2] streamline-generic_file_-interfaces-and-filemap gfs fix
Fix GFS for streamline-generic_file_-interfaces-and-filemap.patch Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/ops_file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index a05b75a7ed8e..f2d0bd80a1c7 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -612,9 +612,9 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
612 612
613const struct file_operations gfs2_file_fops = { 613const struct file_operations gfs2_file_fops = {
614 .llseek = gfs2_llseek, 614 .llseek = gfs2_llseek,
615 .read = generic_file_read, 615 .read = do_sync_read,
616 .aio_read = generic_file_aio_read, 616 .aio_read = generic_file_aio_read,
617 .write = generic_file_write, 617 .write = do_sync_write,
618 .aio_write = generic_file_aio_write, 618 .aio_write = generic_file_aio_write,
619 .unlocked_ioctl = gfs2_ioctl, 619 .unlocked_ioctl = gfs2_ioctl,
620 .mmap = gfs2_mmap, 620 .mmap = gfs2_mmap,