Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
open-iscsi
open-iscsi-add-rhel5-compat
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File open-iscsi-add-rhel5-compat of Package open-iscsi
From 5140d7e924ffc6495cff383685e7ae016da0de22 Mon Sep 17 00:00:00 2001 From: Mike Christie <michaelc@cs.wisc.edu> Date: Fri, 15 Aug 2008 21:14:04 -0500 Subject: [PATCH] Add compat patch for RHEL 5.2 from Erez Zilber The 2.6.14-19_compat.patch checks the kernel version. However, the RHEL 5.2 kernel includes code that does not exist in the vanilla kernel. This causes symbol redefinition. Signed-off-by: Erez Zilber <erezzi.list@gmail.com> --- kernel/2.6.14-19_compat.patch | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/kernel/2.6.14-19_compat.patch b/kernel/2.6.14-19_compat.patch index 8a00ad4..2835b35 100644 --- a/kernel/2.6.14-19_compat.patch +++ b/kernel/2.6.14-19_compat.patch @@ -311,10 +311,10 @@ index cfc5fa6..ede08ef 100644 struct scsi_device; diff --git a/open_iscsi_compat.h b/open_iscsi_compat.h new file mode 100644 -index 0000000..7ea4643 +index 0000000..ecd48df --- /dev/null +++ b/open_iscsi_compat.h -@@ -0,0 +1,270 @@ +@@ -0,0 +1,303 @@ +#include <linux/version.h> +#include <linux/kernel.h> +#include <scsi/scsi.h> @@ -468,12 +468,21 @@ index 0000000..7ea4643 +#endif + +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20) -+ ++#ifdef RHEL_RELEASE_VERSION ++#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,2) ++static inline int is_power_of_2(unsigned long n) ++{ ++ return (n != 0 && ((n & (n - 1)) == 0)); ++} ++#endif ++#else ++/* not a redhat kernel */ +static inline int is_power_of_2(unsigned long n) +{ + return (n != 0 && ((n & (n - 1)) == 0)); +} +#endif ++#endif + +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21) + @@ -485,11 +494,20 @@ index 0000000..7ea4643 +#endif + +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22) -+ ++#ifdef RHEL_RELEASE_VERSION ++#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,2) ++static inline void *shost_priv(struct Scsi_Host *shost) ++{ ++ return (void *)shost->hostdata; ++} ++#endif ++#else ++/* not a redhat kernel */ +static inline void *shost_priv(struct Scsi_Host *shost) +{ + return (void *)shost->hostdata; +} ++#endif + +/* + * Note: We do not support bidi for the compat modules if the kernel @@ -499,6 +517,20 @@ index 0000000..7ea4643 +#define scsi_sglist(cmd) ((struct scatterlist *)(cmd)->request_buffer) +#define scsi_bufflen(cmd) ((cmd)->request_bufflen) + ++#ifdef RHEL_RELEASE_VERSION ++#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,2) ++static inline void scsi_set_resid(struct scsi_cmnd *cmd, int resid) ++{ ++ cmd->resid = resid; ++} ++ ++static inline int scsi_get_resid(struct scsi_cmnd *cmd) ++{ ++ return cmd->resid; ++} ++#endif ++#else ++/* not a redhat kernel */ +static inline void scsi_set_resid(struct scsi_cmnd *cmd, int resid) +{ + cmd->resid = resid; @@ -508,6 +540,7 @@ index 0000000..7ea4643 +{ + return cmd->resid; +} ++#endif + +#endif + -- 1.5.2.4
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor