summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorSteven Whitehouse2006-07-25 23:24:12 +0200
committerSteven Whitehouse2006-07-25 23:24:12 +0200
commita9e5f4d0780ec9cda7a70b08294d7718431b62a1 (patch)
treef21fa310b6ea63f49cf6d710fcd84fe8d66282f3 /mm
parent[GFS2] gfs2_set_flags double locking patch (diff)
downloadkernel-qcow2-linux-a9e5f4d0780ec9cda7a70b08294d7718431b62a1.tar.gz
kernel-qcow2-linux-a9e5f4d0780ec9cda7a70b08294d7718431b62a1.tar.xz
kernel-qcow2-linux-a9e5f4d0780ec9cda7a70b08294d7718431b62a1.zip
[GFS2] Alter direct I/O path
As per comments received, alter the GFS2 direct I/O path so that it uses the standard read functions "out of the box". Needs a small change to one of the VFS functions. This reduces the size of the code quite a lot and also removes the need for one new export. Some more work remains to be done, but this is the bones of the thing. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index b9c91ab7f0f8..a92d690b3ae5 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1122,7 +1122,6 @@ success:
desc->arg.buf += size;
return size;
}
-EXPORT_SYMBOL_GPL(file_read_actor);
/**
* __generic_file_aio_read - generic filesystem read routine
@@ -1184,7 +1183,8 @@ __generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
*ppos = pos + retval;
}
file_accessed(filp);
- goto out;
+ if (retval != 0)
+ goto out;
}
retval = 0;