mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-19 13:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge r7891 and r7892 from trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7893 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-01-13 21:39:34 +00:00
parent e712d32d79
commit 88346b4aaf
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/include/backport.h
+1 -1
View File
@@ -449,7 +449,7 @@ kernel_read_backport(struct file *file, void *buf, size_t count, loff_t *pos)
* See also commit 7bb307e894d5 ("export kernel_write(), convert open-coded
* instances") # v3.10.
*/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) && !defined(RHEL_MAJOR)
static inline ssize_t
kernel_write_backport(struct file *file, void *buf, size_t count, loff_t *pos)
{
scst/src/scst_lib.c
+8
View File
@@ -5853,6 +5853,8 @@ ssize_t scst_read(struct file *file, void *buf, size_t count, loff_t *pos)
return scst_readv(file, &iov, 1, pos);
#else
WARN_ON_ONCE(scst_cmp_fs_ds() != 0);
return vfs_read(file, (void __force __user *)buf, count, pos);
#endif
}
@@ -5869,6 +5871,8 @@ ssize_t scst_write(struct file *file, const void *buf, size_t count,
return scst_writev(file, &iov, 1, pos);
#else
WARN_ON_ONCE(scst_cmp_fs_ds() != 0);
return vfs_write(file, (void __force __user *)buf, count, pos);
#endif
}
@@ -5893,8 +5897,12 @@ ssize_t scst_readv(struct file *file, const struct iovec *vec,
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) || \
(defined(CONFIG_SUSE_KERNEL) && \
LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
WARN_ON_ONCE(scst_cmp_fs_ds() != 0);
return vfs_readv(file, (const struct iovec __user *)vec, vlen, pos, 0);
#else
WARN_ON_ONCE(scst_cmp_fs_ds() != 0);
return vfs_readv(file, (const struct iovec __user *)vec, vlen, pos);
#endif
}