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 of the trunk's r3438,3488:

Browse Source 
RHEL5/6 compilation fixes



git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3553 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2011-06-07 18:19:50 +00:00
parent fbf6841491
commit 068846965a
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/iscsi.c
+12
View File
@@ -2361,10 +2361,18 @@ struct iscsi_cmnd_abort_params {
static mempool_t *iscsi_cmnd_abort_mempool;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
static void iscsi_cmnd_abort_fn(void *ctx)
#else
static void iscsi_cmnd_abort_fn(struct work_struct *work)
#endif
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
struct iscsi_cmnd_abort_params *params = ctx;
#else
struct iscsi_cmnd_abort_params *params = container_of(work,
struct iscsi_cmnd_abort_params, iscsi_cmnd_abort_work);
#endif
struct scst_cmd *scst_cmd = params->scst_cmd;
struct iscsi_session *session = scst_sess_get_tgt_priv(scst_cmd->sess);
struct iscsi_conn *conn;
@@ -2423,7 +2431,11 @@ static void iscsi_on_abort_cmd(struct scst_cmd *scst_cmd)
}
memset(params, 0, sizeof(*params));
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
INIT_WORK(&params->iscsi_cmnd_abort_work, iscsi_cmnd_abort_fn, params);
#else
INIT_WORK(&params->iscsi_cmnd_abort_work, iscsi_cmnd_abort_fn);
#endif
params->scst_cmd = scst_cmd;
scst_cmd_get(scst_cmd);
iscsi-scst/kernel/nthread.c
+2 -2
View File
@@ -1085,7 +1085,7 @@ int istrd(void *arg)
PRINT_INFO("Read thread for pool %p started, PID %d", p, current->pid);
current->flags |= PF_NOFREEZE;
#ifdef RHEL_MAJOR
#if defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5
rc = set_cpus_allowed(current, p->cpu_mask);
#else
rc = set_cpus_allowed_ptr(current, &p->cpu_mask);
@@ -1856,7 +1856,7 @@ int istwr(void *arg)
PRINT_INFO("Write thread for pool %p started, PID %d", p, current->pid);
current->flags |= PF_NOFREEZE;
#ifdef RHEL_MAJOR
#if defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5
rc = set_cpus_allowed(current, p->cpu_mask);
#else
rc = set_cpus_allowed_ptr(current, &p->cpu_mask);
scst/src/scst_main.c
+1 -1
View File
@@ -1630,7 +1630,7 @@ int scst_add_threads(struct scst_cmd_threads *cmd_threads,
* sess->acg can be NULL here, if called from
* scst_check_reassign_sess()!
*/
#ifdef RHEL_MAJOR
#if defined(RHEL_MAJOR) && RHEL_MAJOR -0 <= 5
rc = set_cpus_allowed(thr->cmd_thread,
tgt_dev->acg_dev->acg->acg_cpu_mask);
#else