From 015fe32c126cf850b919cdfa5587eeface1e9c2e Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Mon, 20 Apr 2015 10:37:40 -0300 Subject: [PATCH] Linux 4.1: No need for do_sync_read Make the test here a bit more specific. do_sync_read no longer exists, but we don't use it for new kernels. Trying to define it here in terms of generic_file_read is not helpful as that doesn't exist anymore. Reviewed-on: http://gerrit.openafs.org/11848 Tested-by: BuildBot Reviewed-by: Chas Williams <3chas3@gmail.com> Reviewed-by: Benjamin Kaduk Reviewed-by: Jeffrey Altman (cherry picked from commit fcfa5ae2468d878db962a93d6013fcd3042e6c13) Change-Id: I87bf0fc856d244d15bdae300f0cd6b80ecb63797 Reviewed-on: http://gerrit.openafs.org/11872 Tested-by: BuildBot Reviewed-by: Daria Brashear Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- src/afs/LINUX/osi_compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h index c1cdb19e8..97369a2b1 100644 --- a/src/afs/LINUX/osi_compat.h +++ b/src/afs/LINUX/osi_compat.h @@ -47,7 +47,7 @@ typedef struct path afs_linux_path_t; # endif #endif -#ifndef HAVE_LINUX_DO_SYNC_READ +#if !defined(HAVE_LINUX_DO_SYNC_READ) && !defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) static inline int do_sync_read(struct file *fp, char *buf, size_t count, loff_t *offp) { return generic_file_read(fp, buf, count, offp); -- 2.39.5