diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter.h | 5 | ||||
| -rw-r--r-- | include/scsi/libiscsi.h | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 0eed0b7..1dd075e 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -88,9 +88,8 @@ struct nf_sockopt_ops int (*compat_get)(struct sock *sk, int optval, void __user *user, int *len); - /* Number of users inside set() or get(). */ - unsigned int use; - struct task_struct *cleanup_task; + /* Use the module struct to lock set/get code in place */ + struct module *owner; }; /* Each queued (to userspace) skbuff has one of these. */ diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 007d442..b4b3113 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h @@ -205,6 +205,13 @@ struct iscsi_queue { }; struct iscsi_session { + /* + * Syncs up the scsi eh thread with the iscsi eh thread when sending + * task management functions. This must be taken before the session + * and recv lock. + */ + struct mutex eh_mutex; + /* iSCSI session-wide sequencing */ uint32_t cmdsn; uint32_t exp_cmdsn; |
