Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa363d6a authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging/lustre/autoconf: remove vectored fops tests 

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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarChristopher J. Morrone <chris.morrone.llnl@gmail.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea1db081

drivers/staging/lustre/lustre/llite/file.c

+6 −11
Original line number Diff line number Diff line
@@ -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,