]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging/lustre/autoconf: remove vectored fops tests
authorJames Simmons <uja.ornl@gmail.com>
Thu, 14 Nov 2013 16:13:15 +0000 (00:13 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Nov 2013 04:20:40 +0000 (13:20 +0900)
file_operations.readv/writev have been removed since v2.6.19
We can remove the test and the dead code.

Lustre-change: http://review.whamcloud.com/5343
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2800
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Christopher J. Morrone <chris.morrone.llnl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/llite/file.c

index bfa6b0e97fffd16f651dc3a74ef1ae29bc4f3438..17064b4f61763af171dc6c61068983f28fee0003 100644 (file)
@@ -2699,17 +2699,12 @@ int ll_inode_permission(struct inode *inode, int mask)
        return rc;
 }
 
-#define READ_METHOD aio_read
-#define READ_FUNCTION ll_file_aio_read
-#define WRITE_METHOD aio_write
-#define WRITE_FUNCTION ll_file_aio_write
-
 /* -o localflock - only provides locally consistent flock locks */
 struct file_operations ll_file_operations = {
        .read      = ll_file_read,
-       .READ_METHOD    = READ_FUNCTION,
+       .aio_read = ll_file_aio_read,
        .write    = ll_file_write,
-       .WRITE_METHOD   = WRITE_FUNCTION,
+       .aio_write = ll_file_aio_write,
        .unlocked_ioctl = ll_file_ioctl,
        .open      = ll_file_open,
        .release        = ll_file_release,
@@ -2722,9 +2717,9 @@ struct file_operations ll_file_operations = {
 
 struct file_operations ll_file_operations_flock = {
        .read      = ll_file_read,
-       .READ_METHOD    = READ_FUNCTION,
+       .aio_read    = ll_file_aio_read,
        .write    = ll_file_write,
-       .WRITE_METHOD   = WRITE_FUNCTION,
+       .aio_write   = ll_file_aio_write,
        .unlocked_ioctl = ll_file_ioctl,
        .open      = ll_file_open,
        .release        = ll_file_release,
@@ -2740,9 +2735,9 @@ struct file_operations ll_file_operations_flock = {
 /* These are for -o noflock - to return ENOSYS on flock calls */
 struct file_operations ll_file_operations_noflock = {
        .read      = ll_file_read,
-       .READ_METHOD    = READ_FUNCTION,
+       .aio_read    = ll_file_aio_read,
        .write    = ll_file_write,
-       .WRITE_METHOD   = WRITE_FUNCTION,
+       .aio_write   = ll_file_aio_write,
        .unlocked_ioctl = ll_file_ioctl,
        .open      = ll_file_open,
        .release        = ll_file_release,