mirror of
https://github.com/SCST-project/scst.git
synced 2026-08-18 21:26:31 +00:00
The patch below adds support for the 2.6.29 kernel and also fixes the
checkpatch issues reported by the checkpatch script included with the 2.6.29 kernel and that were not yet reported by the 2.6.28 checkpatch script (trailing statements should be on the next line / struct should normally be const). The patch below has been tested as follows: - Reran scripts/run-regression-tests -k 2.6.24.7 -k 2.6.25.20 -k 2.6.26.8 -k 2.6.27.21 -k 2.6.28.9 -k 2.6.29 and verified the output. - Rebuilt, installed and loaded scst, iscsi-scst and srpt as follows: make -s clean && make -s -C scst install && make -s -C iscsi-scst install && make -s -C srpt install && cd scstadmin && make -s && make -s install && modprobe scst_vdisk && modprobe iscsi-scst && dmesg Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com> with minor cleanups and corrections in put_page_callback-2.6.29.patch git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@717 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -89,9 +89,14 @@ void conn_info_show(struct seq_file *seq, struct iscsi_session *session)
|
||||
"%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->daddr));
|
||||
break;
|
||||
case AF_INET6:
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
|
||||
snprintf(buf, sizeof(buf),
|
||||
"[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
|
||||
NIP6(inet6_sk(sk)->daddr));
|
||||
#else
|
||||
snprintf(buf, sizeof(buf), "[%p6]",
|
||||
&inet6_sk(sk)->daddr);
|
||||
#endif
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -500,7 +505,7 @@ out_err:
|
||||
/* target_mutex supposed to be locked */
|
||||
int conn_add(struct iscsi_session *session, struct iscsi_kern_conn_info *info)
|
||||
{
|
||||
struct iscsi_conn *conn, *new_conn;
|
||||
struct iscsi_conn *conn, *new_conn = NULL;
|
||||
int err;
|
||||
bool reinstatement = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user