jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix macro used to check kernel_read() argument order

Browse Source 
The m4 macro implementing the configure check is called
LINUX_KERNEL_READ_OFFSET_IS_LAST, but it defines a preprocessor symbol
that is just KERNEL_READ_OFFSET_IS_LAST.  Our code needs to check
for the latter being defined, not the former.

Reported by Aaron Ucko.

Reviewed-on: https://gerrit.openafs.org/12808
Reviewed-by: Anders Kaseorg <andersk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit edc5463f3db4b6af2307741d9f4ee8f2c81cd98e)

Reviewed-on: https://gerrit.openafs.org/12809
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 383688fa0d6904291578eb1f9a7c2ec1e06f54ca)

Change-Id: I8fca8c32ec1f255bf5f5a37f44a39901af34408b
Reviewed-on: https://gerrit.openafs.org/12810
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Michael Laß <lass@mail.uni-paderborn.de>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
This commit is contained in:
Benjamin Kaduk 2017-12-14 19:54:57 -06:00 committed by Stephan Wiesand
parent 60fbbc44ce
commit a6df9fb530
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/afs/LINUX/osi_compat.h
View File

@ -606,7 +606,7 @@ afs_file_read(struct file *filp, char __user *buf, size_t len, loff_t *pos)
#if defined(HAVE_LINUX___VFS_WRITE)
return __vfs_read(filp, buf, len, pos);
#elif defined(HAVE_LINUX_KERNEL_WRITE)
# if defined(LINUX_KERNEL_READ_OFFSET_IS_LAST)
# if defined(KERNEL_READ_OFFSET_IS_LAST)
return kernel_read(filp, buf, len, pos);
# else
return kernel_read(filp, *pos, buf, len);
@ -622,7 +622,7 @@ afs_file_write(struct file *filp, char __user *buf, size_t len, loff_t *pos)
#if defined(HAVE_LINUX___VFS_WRITE)
return __vfs_write(filp, buf, len, pos);
#elif defined(HAVE_LINUX_KERNEL_WRITE)
# if defined(LINUX_KERNEL_READ_OFFSET_IS_LAST)
# if defined(KERNEL_READ_OFFSET_IS_LAST)
return kernel_write(filp, buf, len, pos);
# else
return kernel_write(filp, buf, len, *pos);