Merge branch 'svn-trunk'

nightly/conf/nightly.conf

@@ -3,18 +3,18 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-4.1.6          \
+4.1.7          \
 4.0.9-nc       \
 3.19.7-nc      \
 3.18.19-nc     \
 3.17.8-nc      \
 3.16.7-nc      \
 3.15.10-nc     \
-3.14.51-nc     \
+3.14.52-nc     \
 3.13.11-nc     \
 3.12.44-nc     \
 3.11.10-nc     \
-3.10.87-nc     \
+3.10.88-nc     \
 3.9.11-nc      \
 3.8.13-nc      \
 3.7.10-nc      \

scst/src/dev_handlers/scst_vdisk.c

@@ -5090,6 +5090,17 @@ out:
 	return CMD_SUCCEEDED;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+/*
+ * See also patch "block: Export I/O topology for block devices and partitions"
+ * (commit ID c72758f33784).
+ */
+static inline unsigned int queue_physical_block_size(struct request_queue *q)
+{
+	return 4096;
+}
+#endif
+
 static enum compl_status_e vdisk_exec_read_capacity16(struct vdisk_cmd_params *p)
 {
 	struct scst_cmd *cmd = p->cmd;

scst/src/scst_lib.c

@@ -4471,9 +4471,9 @@ struct scst_acg *scst_alloc_add_acg(struct scst_tgt *tgt,
 		if (rc != 0)
 			goto out_del;
 	}
-#endif
 
 	kobject_get(&tgt->tgt_kobj);
+#endif
 
 out:
 	TRACE_EXIT_HRES(acg);
@@ -4568,7 +4568,9 @@ static void scst_free_acg(struct scst_acg *acg)
 	kfree(acg->acg_name);
 	kfree(acg);
 
+#ifndef CONFIG_SCST_PROC
 	kobject_put(&tgt->tgt_kobj);
+#endif
 }
 
 static void scst_release_acg(struct kref *kref)