From ae8c311e207712e87421967749c79250a89d27ff Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 12 Sep 2013 08:09:34 -0400 Subject: [PATCH] linux: provide read and write ops even when we have aio read/write will fall back to aio ops but e.g. writev will fail if there is not either a write or writev op explicitly. force the fallback via do_sync_read/do_sync_write required with 2.6.18-348.x rhel kernels but probably not newer ones Reviewed-on: http://gerrit.openafs.org/10246 Reviewed-by: Marc Dionne Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit e6af2ffc86af17c4be427384467c4122fc5301b3) Change-Id: I1b10a6428b1975ef5c76e1ff40217758ff7d90d9 Reviewed-on: http://gerrit.openafs.org/10248 Reviewed-by: Stephan Wiesand Reviewed-by: Marc Dionne Reviewed-by: Jason Edgecombe Tested-by: BuildBot --- acinclude.m4 | 1 + src/afs/LINUX/osi_vnodeops.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index c1d3f4bea5..f36a3821a7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -820,6 +820,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) AC_CHECK_LINUX_STRUCT([cred], [session_keyring], [cred.h]) AC_CHECK_LINUX_STRUCT([ctl_table], [ctl_name], [sysctl.h]) AC_CHECK_LINUX_STRUCT([dentry_operations], [d_automount], [dcache.h]) + AC_CHECK_LINUX_STRUCT([file_operations], [writev], [fs.h]) AC_CHECK_LINUX_STRUCT([inode], [i_alloc_sem], [fs.h]) AC_CHECK_LINUX_STRUCT([inode], [i_blkbits], [fs.h]) AC_CHECK_LINUX_STRUCT([inode], [i_blksize], [fs.h]) diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index 64b5fdfd5e..825ad51111 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -791,6 +791,10 @@ struct file_operations afs_file_fops = { #ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ .aio_read = afs_linux_aio_read, .aio_write = afs_linux_aio_write, +#ifdef STRUCT_FILE_OPERATIONS_HAS_WRITEV + .read = do_sync_read, + .write = do_sync_write, +#endif #else .read = afs_linux_read, .write = afs_linux_write,