diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c
index c4c8d1f1e..b30782060 100644
--- a/iscsi-scst/kernel/iscsi.c
+++ b/iscsi-scst/kernel/iscsi.c
@@ -1340,7 +1340,7 @@ static struct iscsi_cmnd *cmnd_find_itt_get(struct iscsi_conn *conn, __be32 itt)
return found_cmnd;
}
-/**
+/*
** We use the ITT hash only to find original request PDU for subsequent
** Data-Out PDUs.
**/
diff --git a/qla2x00t/doc/qla2x00t-howto.html b/qla2x00t/doc/qla2x00t-howto.html
index 925de8968..a18d5f498 100644
--- a/qla2x00t/doc/qla2x00t-howto.html
+++ b/qla2x00t/doc/qla2x00t-howto.html
@@ -32,7 +32,7 @@ qla2xxx [0000:01:00.1]-00fb:165: QLogic QLE2562 - PCI-Express Dual Channel 8Gb F
The above information not only contains the HBA model number (QLE2562) but
also the RISC controller ID (ISP2532).
-Download the Linux version of the QConvergeConsoleCLI software package
+(Optional) Download the Linux version of the QConvergeConsoleCLI software package
from http://driverdownloads.qlogic.com/
and install that software package.
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 1c5ca2233..16ddb3e03 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -3135,7 +3135,7 @@ out:
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
-/**
+/*
* finish_read - Release the pages referenced by prepare_read().
*/
static void finish_read(struct scatterlist *sg, int sg_cnt)
@@ -7202,7 +7202,7 @@ static void blockio_end_sync_io(struct bio *bio)
#endif
}
-/**
+/*
* blockio_read_sync() - read up to @len bytes from a block I/O device
*
* Returns:
diff --git a/scst/src/scst_debug.c b/scst/src/scst_debug.c
index 3e5de31b0..cdbaf8c22 100644
--- a/scst/src/scst_debug.c
+++ b/scst/src/scst_debug.c
@@ -58,7 +58,7 @@ static inline int get_current_tid(void)
#endif
}
-/**
+/*
* debug_print_with_prefix() - prints a debug message
*
* Adds, if requested by trace_flag, debug prefix in the beginning
@@ -98,7 +98,7 @@ int debug_print_with_prefix(unsigned long trace_flag, const char *severity,
}
EXPORT_SYMBOL(debug_print_with_prefix);
-/**
+/*
* debug_print_buffer() - print a buffer
*
* Prints in the log data from the buffer
diff --git a/scst/src/scst_dlm.c b/scst/src/scst_dlm.c
index 26e64535a..e4fa54a9f 100644
--- a/scst/src/scst_dlm.c
+++ b/scst/src/scst_dlm.c
@@ -53,7 +53,7 @@ static void scst_dlm_ast(void *astarg)
complete(&scst_lksb->compl);
}
-/**
+/*
* scst_dlm_cancel - Synchronously cancel a pending dlm_lock() operation
*/
static int scst_dlm_cancel(dlm_lockspace_t *ls, struct scst_lksb *lksb,
@@ -109,7 +109,7 @@ out:
return res;
}
-/**
+/*
* scst_dlm_unlock_wait - Discard a DLM lock
*/
static int scst_dlm_unlock_wait(dlm_lockspace_t *ls, struct scst_lksb *lksb)
@@ -571,7 +571,7 @@ out:
return *entries ? 0 : -ENOMEM;
}
-/**
+/*
* scst_dlm_update_nodeids - Update the Corosync node ID array pr_dlm->nodeid[]
*/
static int scst_dlm_update_nodeids(struct scst_pr_dlm_data *pr_dlm)
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index b6a1f8ffd..e2abb8b9b 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -1696,7 +1696,7 @@ static inline void tm_dbg_init_tgt_dev(struct scst_tgt_dev *tgt_dev) {}
static inline void tm_dbg_deinit_tgt_dev(struct scst_tgt_dev *tgt_dev) {}
#endif /* CONFIG_SCST_DEBUG_TM */
-/**
+/*
* scst_alloc_sense() - allocate sense buffer for command
*
* Allocates, if necessary, sense buffer for command. Returns 0 on success
@@ -1733,7 +1733,7 @@ out:
}
EXPORT_SYMBOL(scst_alloc_sense);
-/**
+/*
* scst_alloc_set_sense() - allocate and fill sense buffer for command
*
* Allocates, if necessary, sense buffer for command and copies in
@@ -1970,7 +1970,7 @@ out:
return res;
}
-/**
+/*
* scst_set_cmd_error() - set error in the command and fill the sense buffer.
*
* Sets error in the command and fill the sense buffer. Returns 0 on success,
@@ -2141,7 +2141,7 @@ int scst_set_invalid_field_in_parm_list(struct scst_cmd *cmd, int field_offs,
}
EXPORT_SYMBOL(scst_set_invalid_field_in_parm_list);
-/**
+/*
* scst_set_sense() - set sense from KEY/ASC/ASCQ numbers
*
* Sets the corresponding fields in the sense buffer taking sense type
@@ -2205,7 +2205,7 @@ int scst_set_sense(uint8_t *buffer, int len, bool d_sense,
}
EXPORT_SYMBOL(scst_set_sense);
-/**
+/*
* scst_analyze_sense() - analyze sense
*
* Returns true if sense matches to (key, asc, ascq) and false otherwise.
@@ -2286,7 +2286,7 @@ out:
}
EXPORT_SYMBOL(scst_analyze_sense);
-/**
+/*
* scst_is_ua_sense() - determine if the sense is UA sense
*
* Returns true if the sense is valid and carrying a Unit
@@ -2317,7 +2317,7 @@ bool scst_is_ua_global(const uint8_t *sense, int len)
return res;
}
-/**
+/*
* scst_check_convert_sense() - check sense type and convert it if needed
*
* Checks if sense in the sense buffer, if any, is in the correct format.
@@ -2395,7 +2395,7 @@ out:
return res;
}
-/**
+/*
* scst_set_busy() - set BUSY or TASK QUEUE FULL status
*
* Sets BUSY or TASK QUEUE FULL status depending on if this session has other
@@ -2426,7 +2426,7 @@ void scst_set_busy(struct scst_cmd *cmd)
}
EXPORT_SYMBOL(scst_set_busy);
-/**
+/*
* scst_set_initial_UA() - set initial Unit Attention
*
* Sets initial Unit Attention on all devices of the session,
@@ -2583,7 +2583,7 @@ out:
return;
}
-/**
+/*
* scst_capacity_data_changed() - notify SCST about device capacity change
*
* Notifies SCST core that dev has changed its capacity. Called under no locks.
@@ -2793,7 +2793,7 @@ void scst_report_luns_changed(struct scst_acg *acg)
return;
}
-/**
+/*
* scst_aen_done() - AEN processing done
*
* Notifies SCST that the driver has sent the AEN and it
@@ -3171,7 +3171,7 @@ int scst_get_cmd_abnormal_done_state(struct scst_cmd *cmd)
}
EXPORT_SYMBOL_GPL(scst_get_cmd_abnormal_done_state);
-/**
+/*
* scst_set_cmd_abnormal_done_state() - set command's next abnormal done state
*
* Sets state of the SCSI target state machine to abnormally complete command
@@ -3513,7 +3513,7 @@ out:
return res;
}
-/**
+/*
* scst_restore_sg_buff() - restores modified sg buffer
*
* Restores modified sg buffer in the original state.
@@ -3548,7 +3548,7 @@ void scst_restore_sg_buff(struct scst_cmd *cmd)
}
EXPORT_SYMBOL(scst_restore_sg_buff);
-/**
+/*
* scst_set_resp_data_len() - set response data length
*
* Sets response data length for cmd and truncates its SG vector accordingly.
@@ -3695,7 +3695,7 @@ out:
return;
}
-/**
+/*
* scst_cmd_set_write_not_received_data_len() - sets cmd's not received len
*
* Sets cmd's not received data length. Also automatically sets resid_possible.
@@ -3771,7 +3771,7 @@ void scst_cmd_set_write_no_data_received(struct scst_cmd *cmd)
return;
}
-/**
+/*
* __scst_get_resid() - returns residuals for cmd
*
* Returns residuals for command. Must not be called directly, use
@@ -3878,7 +3878,7 @@ void scst_queue_retry_cmd(struct scst_cmd *cmd)
return;
}
-/**
+/*
* scst_update_hw_pending_start() - update commands pending start
*
* Updates the command's hw_pending_start as if it's just started hw pending.
@@ -4284,7 +4284,7 @@ bool scst_device_is_exported(struct scst_device *dev)
return !list_empty(&dev->dev_tgt_dev_list);
}
-/**
+/*
* scst_init_mem_lim - initialize memory limits structure
*
* Initializes memory limits structure mem_lim according to
@@ -4753,7 +4753,7 @@ out_free:
goto out;
}
-/**
+/*
* scst_del_acg - delete an ACG from the per-target ACG list and from sysfs
*
* The caller must hold scst_mutex and activity must have been suspended.
@@ -4792,7 +4792,7 @@ static void scst_del_acg(struct scst_acg *acg)
#endif
}
-/**
+/*
* scst_free_acg - free an ACG
*
* The caller must hold scst_mutex and activity must have been suspended.
@@ -4900,7 +4900,7 @@ void scst_get_acg(struct scst_acg *acg)
kref_get(&acg->acg_kref);
}
-/**
+/*
* scst_close_del_free_acg - close sessions, delete and free an ACG
*
* The caller must hold scst_mutex and activity must have been suspended.
@@ -7223,7 +7223,7 @@ void scst_sched_session_free(struct scst_session *sess)
return;
}
-/**
+/*
* scst_cmd_get() - increase command's reference counter
*/
void scst_cmd_get(struct scst_cmd *cmd)
@@ -7232,7 +7232,7 @@ void scst_cmd_get(struct scst_cmd *cmd)
}
EXPORT_SYMBOL(scst_cmd_get);
-/**
+/*
* scst_cmd_put() - decrease command's reference counter
*/
void scst_cmd_put(struct scst_cmd *cmd)
@@ -7241,7 +7241,7 @@ void scst_cmd_put(struct scst_cmd *cmd)
}
EXPORT_SYMBOL(scst_cmd_put);
-/**
+/*
* scst_cmd_set_ext_cdb() - sets cmd's extended CDB and its length
*/
void scst_cmd_set_ext_cdb(struct scst_cmd *cmd,
@@ -8083,12 +8083,18 @@ static struct request *blk_make_request(struct request_queue *q,
blk_put_request(rq);
return ERR_PTR(ret);
}
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
ret = blk_rq_append_bio(rq, bio);
if (unlikely(ret)) {
blk_put_request(rq);
return ERR_PTR(ret);
}
+#else
+ ret = blk_rq_append_bio(rq, &bio);
+ if (unlikely(ret)) {
+ blk_put_request(rq);
+ return ERR_PTR(ret);
+ }
#endif
}
@@ -8274,7 +8280,7 @@ out_free_bios:
goto out;
}
-/**
+/*
* blk_map_kern_sg - map kernel data to a request for REQ_TYPE_BLOCK_PC
* @rq: request to fill
* @sgl: area to map
@@ -8425,7 +8431,7 @@ out:
return res;
}
-/**
+/*
* sg_copy - copy one SG vector to another
* @dst_sg: destination SG
* @src_sg: source SG
@@ -8903,7 +8909,7 @@ out:
return res;
}
-/**
+/*
* scst_copy_sg() - copy data between the command's SGs
*
* Copies data between cmd->tgt_i_sg and cmd->sg as well as
@@ -10065,7 +10071,7 @@ static void scst_init_dif_checks(struct scst_device *dev)
return;
}
-/**
+/*
* scst_dev_set_dif_static_app_tag_combined() - sets static app tag
*
* Description:
@@ -10365,7 +10371,7 @@ out:
return res;
}
-/**
+/*
* scst_set_dif_params() - sets DIF parameters
*
* Description:
@@ -11747,7 +11753,7 @@ static int get_cdb_info_ext_copy(struct scst_cmd *cmd,
return get_cdb_info_len_4(cmd, sdbops);
}
-/**
+/*
* get_cdb_info_apt() - Parse ATA PASS-THROUGH CDB.
*
* Parse ATA PASS-THROUGH(12) and ATA PASS-THROUGH(16). See also SAT-3 for a
@@ -11897,7 +11903,7 @@ static int get_cdb_info_mo(struct scst_cmd *cmd,
return get_cdb_info_len_4(cmd, sdbops);
}
-/**
+/*
* scst_get_cdb_info() - fill various info about the command's CDB
*
* Description:
@@ -12042,13 +12048,13 @@ out_err:
}
EXPORT_SYMBOL(scst_unpack_lun);
-/**
+/*
** Generic parse() support routines.
** Done via pointer on functions to avoid unneeded dereferences on
** the fast path.
**/
-/**
+/*
* scst_calc_block_shift() - calculate block shift
*
* Calculates and returns block shift for the given sector size
@@ -12087,7 +12093,7 @@ EXPORT_SYMBOL_GPL(scst_calc_block_shift);
_shift < 0 || ((a) & ~((_plus_one << _shift) - 1)) != 0;\
})
-/**
+/*
* scst_generic_parse() - Generic parse() for devices supporting an LBA
*/
static inline int scst_generic_parse(struct scst_cmd *cmd, const int timeout[3])
@@ -12149,7 +12155,7 @@ out:
return res;
}
-/**
+/*
* scst_sbc_generic_parse() - generic SBC parsing
*
* Generic parse() for SBC (disk) devices
@@ -12170,7 +12176,7 @@ int scst_sbc_generic_parse(struct scst_cmd *cmd)
}
EXPORT_SYMBOL_GPL(scst_sbc_generic_parse);
-/**
+/*
* scst_cdrom_generic_parse() - generic MMC parse
*
* Generic parse() for MMC (cdrom) devices
@@ -12192,7 +12198,7 @@ int scst_cdrom_generic_parse(struct scst_cmd *cmd)
}
EXPORT_SYMBOL_GPL(scst_cdrom_generic_parse);
-/**
+/*
* scst_modisk_generic_parse() - generic MO parse
*
* Generic parse() for MO disk devices
@@ -12214,7 +12220,7 @@ int scst_modisk_generic_parse(struct scst_cmd *cmd)
}
EXPORT_SYMBOL_GPL(scst_modisk_generic_parse);
-/**
+/*
* scst_tape_generic_parse() - generic tape parse
*
* Generic parse() for tape devices
@@ -12300,7 +12306,7 @@ static int scst_null_parse(struct scst_cmd *cmd)
return res;
}
-/**
+/*
* scst_changer_generic_parse() - generic changer parse
*
* Generic parse() for changer devices
@@ -12318,7 +12324,7 @@ int scst_changer_generic_parse(struct scst_cmd *cmd)
}
EXPORT_SYMBOL_GPL(scst_changer_generic_parse);
-/**
+/*
* scst_processor_generic_parse - generic SCSI processor parse
*
* Generic parse() for SCSI processor devices
@@ -12336,7 +12342,7 @@ int scst_processor_generic_parse(struct scst_cmd *cmd)
}
EXPORT_SYMBOL_GPL(scst_processor_generic_parse);
-/**
+/*
* scst_raid_generic_parse() - generic RAID parse
*
* Generic parse() for RAID devices
@@ -12405,13 +12411,13 @@ out_abn:
goto out;
}
-/**
+/*
** Generic dev_done() support routines.
** Done via pointer on functions to avoid unneeded dereferences on
** the fast path.
**/
-/**
+/*
* scst_block_generic_dev_done() - generic SBC dev_done
*
* Generic dev_done() for block (SBC) devices
@@ -12480,7 +12486,7 @@ out:
}
EXPORT_SYMBOL_GPL(scst_block_generic_dev_done);
-/**
+/*
* scst_tape_generic_dev_done() - generic tape dev done
*
* Generic dev_done() for tape devices
@@ -12722,7 +12728,7 @@ static void scst_check_internal_sense(struct scst_device *dev, int result,
return;
}
-/**
+/*
* scst_to_dma_dir() - translate SCST's data direction to DMA direction
*
* Translates SCST's data direction to DMA one from backend storage
@@ -13973,7 +13979,7 @@ out:
return;
}
-/**
+/*
* scst_get_max_lun_commands() - return maximum supported commands count
*
* Returns maximum commands count which can be queued to this LUN in this
@@ -14040,7 +14046,7 @@ out_unlock:
}
EXPORT_SYMBOL(scst_get_max_lun_commands);
-/**
+/*
* scst_reassign_retained_sess_states() - reassigns retained states
*
* Reassigns retained during nexus loss states from old_sess to new_sess.
@@ -14156,7 +14162,7 @@ out:
}
EXPORT_SYMBOL(scst_reassign_retained_sess_states);
-/**
+/*
* scst_get_next_lexem() - parse and return next lexem in the string
*
* Returns pointer to the next lexem from token_str skipping
@@ -14185,7 +14191,7 @@ char *scst_get_next_lexem(char **token_str)
}
EXPORT_SYMBOL_GPL(scst_get_next_lexem);
-/**
+/*
* scst_restore_token_str() - restore string modified by scst_get_next_lexem()
*
* Restores token_str modified by scst_get_next_lexem() to the
@@ -14200,7 +14206,7 @@ void scst_restore_token_str(char *prev_lexem, char *token_str)
}
EXPORT_SYMBOL_GPL(scst_restore_token_str);
-/**
+/*
* scst_get_next_token_str() - parse and return next token
*
* This function returns pointer to the next token strings from input_str
diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c
index 98f7b13f9..10e4a61f2 100644
--- a/scst/src/scst_main.c
+++ b/scst/src/scst_main.c
@@ -55,7 +55,7 @@ your kernel and CONFIG_SCST_STRICT_SERIALIZING is not defined. \
Pass-through dev handlers will not work.
#endif
-/**
+/*
** SCST global variables. They are all uninitialized to have their layout in
** memory be exactly as specified. Otherwise compiler puts zero-initialized
** variable separately from nonzero-initialized ones.
@@ -404,7 +404,7 @@ out:
}
EXPORT_SYMBOL(__scst_register_target_template_non_gpl);
-/**
+/*
* scst_unregister_target_template() - unregister target template
*
* Target drivers supposed to behave sanely and not call register()
@@ -474,7 +474,7 @@ out_err_up:
}
EXPORT_SYMBOL(scst_unregister_target_template);
-/**
+/*
* scst_register_target() - register target
*
* Registers a target for template vtt and returns new target structure on
@@ -597,7 +597,7 @@ out_free_tgt:
}
EXPORT_SYMBOL(scst_register_target);
-/**
+/*
* scst_unregister_target() - unregister target.
*
* It is supposed that no attempts to create new sessions for this
@@ -933,7 +933,7 @@ out:
#undef SCST_SUSP_WAIT_REPORT_TIMEOUT
}
-/**
+/*
* scst_suspend_activity() - globally suspend any activity
*
* Description:
@@ -1554,7 +1554,7 @@ out_resume:
}
EXPORT_SYMBOL_GPL(scst_register_virtual_device_node);
-/**
+/*
* scst_unregister_virtual_device() - unegister a virtual device.
* @id: the device's ID, returned by the registration function
*/
@@ -1741,7 +1741,7 @@ out_resume:
}
EXPORT_SYMBOL_GPL(__scst_register_dev_driver);
-/**
+/*
* scst_unregister_dev_driver() - unregister pass-through dev handler driver
*/
void scst_unregister_dev_driver(struct scst_dev_type *dev_type)
@@ -1861,7 +1861,7 @@ out:
}
EXPORT_SYMBOL_GPL(__scst_register_virtual_dev_driver);
-/**
+/*
* scst_unregister_virtual_dev_driver() - unregister virtual dev driver
*/
void scst_unregister_virtual_dev_driver(struct scst_dev_type *dev_type)
@@ -2237,7 +2237,7 @@ out_detach:
goto out;
}
-/**
+/*
* scst_init_threads() - initialize SCST processing threads pool
*
* Initializes scst_cmd_threads structure
@@ -2264,7 +2264,7 @@ void scst_init_threads(struct scst_cmd_threads *cmd_threads)
}
EXPORT_SYMBOL_GPL(scst_init_threads);
-/**
+/*
* scst_deinit_threads() - deinitialize SCST processing threads pool
*
* Deinitializes scst_cmd_threads structure
diff --git a/scst/src/scst_mem.c b/scst/src/scst_mem.c
index 32e2e703c..b4451fbf3 100644
--- a/scst/src/scst_mem.c
+++ b/scst/src/scst_mem.c
@@ -1145,7 +1145,7 @@ out_uncheck:
}
EXPORT_SYMBOL_GPL(sgv_pool_alloc);
-/**
+/*
* sgv_get_priv - return the private allocation data
*
* Allows to get the allocation private data for this SGV
@@ -1159,7 +1159,7 @@ EXPORT_SYMBOL_GPL(sgv_get_priv);
/**
* sgv_pool_free - free previously allocated SG vector
- * @sgv: the SGV object to free
+ * @obj: the SGV object to free
* @mem_lim: memory limits
*
* Description:
@@ -1224,7 +1224,7 @@ void sgv_pool_free(struct sgv_pool_obj *obj, struct scst_mem_lim *mem_lim)
}
EXPORT_SYMBOL_GPL(sgv_pool_free);
-/**
+/*
* scst_alloc_sg() - allocates an SG vector
*
* Allocates and returns pointer to SG vector with data size "size".
@@ -1302,7 +1302,7 @@ out_uncheck:
}
EXPORT_SYMBOL_GPL(scst_alloc_sg);
-/**
+/*
* scst_free_sg() - frees SG vector
*
* Frees SG vector returned by scst_alloc_sg().
@@ -1497,7 +1497,7 @@ static void sgv_evaluate_local_max_pages(void)
return;
}
-/**
+/*
* sgv_pool_flush() - flushes the SGV pool.
*
* Flushes, i.e. frees, all the cached entries in the SGV pool.
@@ -1591,7 +1591,7 @@ EXPORT_SYMBOL_GPL(sgv_pool_set_allocator);
/**
* sgv_pool_create_node - creates and initializes an SGV pool
* @name: the name of the SGV pool
- * @clustered: sets type of the pages clustering.
+ * @clustering_type: sets type of the pages clustering.
* @single_alloc_pages: if 0, then the SGV pool will work in the set of
* power 2 size buffers mode. If >0, then the SGV pool will
* work in the fixed size buffers mode. In this case
@@ -1682,7 +1682,7 @@ out_free:
}
EXPORT_SYMBOL_GPL(sgv_pool_create_node);
-/**
+/*
* sgv_pool_get - increase ref counter for the corresponding SGV pool
*
* Increases ref counter for the corresponding SGV pool
@@ -1696,7 +1696,7 @@ void sgv_pool_get(struct sgv_pool *pool)
}
EXPORT_SYMBOL_GPL(sgv_pool_get);
-/**
+/*
* sgv_pool_put - decrease ref counter for the corresponding SGV pool
*
* Decreases ref counter for the corresponding SGV pool. If the ref
@@ -2186,7 +2186,7 @@ static struct kobj_type sgv_ktype = {
.default_attrs = sgv_default_attrs,
};
-/**
+/*
* scst_add_sgv_kobj() - Initialize and add the root SGV kernel object.
*/
int scst_add_sgv_kobj(struct kobject *parent, const char *name)
diff --git a/scst/src/scst_sysfs.c b/scst/src/scst_sysfs.c
index 5c9d311c1..9447b05f7 100644
--- a/scst/src/scst_sysfs.c
+++ b/scst/src/scst_sysfs.c
@@ -320,7 +320,7 @@ out:
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6 || \
(RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 < 6))
-/**
+/*
** Backported sysfs functions.
**/
@@ -348,7 +348,7 @@ static void sysfs_remove_files(struct kobject *kobj,
}
#endif
-/**
+/*
** Sysfs work
**/
@@ -359,7 +359,7 @@ static int active_sysfs_works;
static int last_sysfs_work_res;
static struct task_struct *sysfs_work_thread;
-/**
+/*
* scst_alloc_sysfs_work() - allocates a sysfs work
*/
int scst_alloc_sysfs_work(int (*sysfs_work_fn)(struct scst_sysfs_work_item *),
@@ -418,7 +418,7 @@ static void scst_sysfs_work_release(struct kref *kref)
return;
}
-/**
+/*
* scst_sysfs_work_get() - increases ref counter of the sysfs work
*/
void scst_sysfs_work_get(struct scst_sysfs_work_item *work)
@@ -427,7 +427,7 @@ void scst_sysfs_work_get(struct scst_sysfs_work_item *work)
}
EXPORT_SYMBOL(scst_sysfs_work_get);
-/**
+/*
* scst_sysfs_work_put() - decreases ref counter of the sysfs work
*/
void scst_sysfs_work_put(struct scst_sysfs_work_item *work)
@@ -527,7 +527,7 @@ static int sysfs_work_thread_fn(void *arg)
return 0;
}
-/**
+/*
* scst_sysfs_queue_wait_work() - waits for the work to complete
*
* Returns status of the completed work or -EAGAIN if the work not
@@ -782,7 +782,7 @@ static void scst_ungrab_devt_ptr(struct scst_dev_type *devt)
return;
}
-/**
+/*
** Regular SCST sysfs ops
**/
static ssize_t scst_show(struct kobject *kobj, struct attribute *attr,
@@ -825,7 +825,7 @@ struct sysfs_ops *scst_sysfs_get_sysfs_ops(void)
}
EXPORT_SYMBOL_GPL(scst_sysfs_get_sysfs_ops);
-/**
+/*
** Target Template
**/
@@ -1243,7 +1243,7 @@ void scst_tgtt_sysfs_del(struct scst_tgt_template *tgtt)
return;
}
-/**
+/*
** Target directory implementation
**/
@@ -3041,7 +3041,7 @@ void scst_tgt_sysfs_put(struct scst_tgt *tgt)
return;
}
-/**
+/*
** Devices directory implementation
**/
@@ -4108,7 +4108,7 @@ out:
return res;
}
-/**
+/*
** Tgt_dev implementation
**/
@@ -4420,7 +4420,7 @@ void scst_tgt_dev_sysfs_del(struct scst_tgt_dev *tgt_dev)
return;
}
-/**
+/*
** Sessions subdirectory implementation
**/
@@ -5136,7 +5136,7 @@ out:
return;
}
-/**
+/*
** Target luns directory implementation
**/
@@ -5255,7 +5255,7 @@ out_del:
goto out;
}
-/**
+/*
** ini_groups directory implementation.
**/
@@ -5723,7 +5723,7 @@ out_del:
goto out;
}
-/**
+/*
** acn
**/
@@ -5815,7 +5815,7 @@ void scst_acn_sysfs_del(struct scst_acn *acn)
}
-/**
+/*
** Dev handlers
**/
@@ -6289,7 +6289,7 @@ void scst_devt_sysfs_del(struct scst_dev_type *devt)
return;
}
-/**
+/*
** SCST sysfs device_groups//devices/ implementation.
**/
@@ -6311,7 +6311,7 @@ void scst_dg_dev_sysfs_del(struct scst_dev_group *dg, struct scst_dg_dev *dgdev)
TRACE_EXIT();
}
-/**
+/*
** SCST sysfs device_groups//devices directory implementation.
**/
@@ -6406,7 +6406,7 @@ static const struct attribute *scst_dg_devs_attrs[] = {
NULL,
};
-/**
+/*
** SCST sysfs device_groups//target_groups// implementation.
**/
@@ -6496,7 +6496,7 @@ void scst_tg_tgt_sysfs_del(struct scst_target_group *tg,
TRACE_EXIT();
}
-/**
+/*
** SCST sysfs device_groups//target_groups/ directory implementation.
**/
@@ -6813,7 +6813,7 @@ void scst_tg_sysfs_del(struct scst_target_group *tg)
TRACE_EXIT();
}
-/**
+/*
** SCST sysfs device_groups//target_groups directory implementation.
**/
@@ -6907,7 +6907,7 @@ static const struct attribute *scst_dg_tgs_attrs[] = {
NULL,
};
-/**
+/*
** SCST sysfs device_groups directory implementation.
**/
@@ -7013,7 +7013,7 @@ static const struct attribute *scst_device_groups_attrs[] = {
NULL,
};
-/**
+/*
** SCST sysfs root directory implementation
**/
@@ -7597,7 +7597,7 @@ static struct kobj_type scst_sysfs_root_ktype = {
.default_attrs = scst_sysfs_root_default_attrs,
};
-/**
+/*
** Sysfs user info
**/
@@ -7626,7 +7626,7 @@ static struct scst_sysfs_user_info *scst_sysfs_user_find_info(uint32_t cookie)
return res;
}
-/**
+/*
* scst_sysfs_user_get_info() - get user_info
*
* Finds the user_info based on cookie and mark it as received the reply by
@@ -7655,13 +7655,13 @@ struct scst_sysfs_user_info *scst_sysfs_user_get_info(uint32_t cookie)
}
EXPORT_SYMBOL_GPL(scst_sysfs_user_get_info);
-/**
+/*
** Helper functionality to help target drivers and dev handlers support
** sending events to user space and wait for their completion in a safe
** manner. See samples how to use it in iscsi-scst or scst_user.
**/
-/**
+/*
* scst_sysfs_user_add_info() - create and add user_info in the global list
*
* Creates an info structure and adds it in the info_list.
@@ -7703,7 +7703,7 @@ out:
}
EXPORT_SYMBOL_GPL(scst_sysfs_user_add_info);
-/**
+/*
* scst_sysfs_user_del_info - delete and frees user_info
*/
void scst_sysfs_user_del_info(struct scst_sysfs_user_info *info)
@@ -7750,7 +7750,7 @@ static bool scst_sysfs_user_info_executing(struct scst_sysfs_user_info *info)
return res;
}
-/**
+/*
* scst_wait_info_completion() - wait for a user space event's completion
*
* Waits for the info request been completed by user space at most timeout
diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index d56f0650e..4ddee69b3 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -47,7 +47,7 @@ static struct scst_cmd *__scst_find_cmd_by_tag(struct scst_session *sess,
static void scst_process_redirect_cmd(struct scst_cmd *cmd,
enum scst_exec_context context, int check_retries);
-/**
+/*
* scst_post_parse() - do post parse actions
*
* This function must be called by dev handler after its parse() callback
@@ -59,7 +59,7 @@ void scst_post_parse(struct scst_cmd *cmd)
}
EXPORT_SYMBOL_GPL(scst_post_parse);
-/**
+/*
* scst_post_dev_alloc_data_buf() - do post dev_alloc_data_buf actions
*
* This function must be called by dev handler after its dev_alloc_data_buf()
@@ -3180,7 +3180,7 @@ out_done:
return res;
}
-/**
+/*
* __scst_check_local_events() - check if there are any local SCSI events
*
* Description:
@@ -4802,7 +4802,7 @@ static inline void scst_inc_expected_sn_idle(struct scst_order_data *order_data)
return;
}
-/**
+/*
* scst_cmd_set_sn - Assign SN and a slot number to a command.
*
* Commands that may be executed concurrently are assigned the same slot
@@ -5350,7 +5350,7 @@ int scst_init_thread(void *arg)
return 0;
}
-/**
+/*
* scst_ioctx_get() - Associate an I/O context with a thread.
*
* Associate an I/O context with a thread in such a way that all threads in an
@@ -5421,7 +5421,7 @@ See "http://lkml.org/lkml/2012/7/17/515" for more details.
return;
}
-/**
+/*
* scst_ioctx_put() - Free I/O context allocated by scst_ioctx_get().
*/
static void scst_ioctx_put(struct scst_cmd_threads *p_cmd_threads)
@@ -5437,7 +5437,7 @@ static void scst_ioctx_put(struct scst_cmd_threads *p_cmd_threads)
return;
}
-/**
+/*
* scst_process_active_cmd() - process active command
*
* Description:
@@ -6012,7 +6012,7 @@ out:
return;
}
-/**
+/*
* scst_prepare_async_mcmd() - prepare async management command
*
* Notifies SCST that management command is going to be async, i.e.
@@ -6039,7 +6039,7 @@ void scst_prepare_async_mcmd(struct scst_mgmt_cmd *mcmd)
}
EXPORT_SYMBOL_GPL(scst_prepare_async_mcmd);
-/**
+/*
* scst_async_mcmd_completed() - async management command completed
*
* Notifies SCST that async management command, prepared by
@@ -7787,7 +7787,7 @@ out_unlock:
goto out;
}
-/**
+/*
* scst_rx_mgmt_fn() - create new management command and send it for execution
*
* Description:
@@ -8064,7 +8064,7 @@ struct scst_acg *scst_find_acg(const struct scst_session *sess)
return __scst_find_acg(sess->tgt, sess->initiator_name);
}
-/**
+/*
* scst_initiator_has_luns() - check if this initiator will see any LUNs
*
* Checks if this initiator will see any LUNs upon connect to this target.
@@ -8589,7 +8589,7 @@ static struct scst_cmd *__scst_find_cmd_by_tag(struct scst_session *sess,
return res;
}
-/**
+/*
* scst_find_cmd() - find command by custom comparison function
*
* Finds a command based on user supplied data and comparison
@@ -8636,7 +8636,7 @@ out:
}
EXPORT_SYMBOL(scst_find_cmd);
-/**
+/*
* scst_find_cmd_by_tag() - find command by tag
*
* Finds a command based on the supplied tag comparing it with one
diff --git a/scst/src/scst_tg.c b/scst/src/scst_tg.c
index b9b58e174..94c54ac25 100644
--- a/scst/src/scst_tg.c
+++ b/scst/src/scst_tg.c
@@ -664,7 +664,7 @@ static void scst_reset_tgt_alua_filter(struct scst_target_group *tg,
scst_check_alua_invariant();
}
-/**
+/*
* scst_tg_tgt_add() - Add a target to a target group.
*/
int scst_tg_tgt_add(struct scst_target_group *tg, const char *name)
@@ -737,7 +737,7 @@ static void __scst_tg_tgt_remove(struct scst_target_group *tg,
TRACE_EXIT();
}
-/**
+/*
* scst_tg_tgt_remove_by_name() - Remove a target from a target group.
*/
int scst_tg_tgt_remove_by_name(struct scst_target_group *tg, const char *name)
@@ -800,7 +800,7 @@ static struct kobj_type scst_tg_ktype = {
.release = scst_release_tg,
};
-/**
+/*
* scst_tg_add() - Add a target group.
*/
int scst_tg_add(struct scst_dev_group *dg, const char *name)
@@ -868,7 +868,7 @@ static void __scst_tg_remove(struct scst_dev_group *dg,
TRACE_EXIT();
}
-/**
+/*
* scst_tg_remove_by_name() - Remove a target group.
*/
int scst_tg_remove_by_name(struct scst_dev_group *dg, const char *name)
@@ -1156,7 +1156,7 @@ static void scst_reset_dev_alua_filter(struct scst_device *dev)
scst_check_alua_invariant();
}
-/**
+/*
* scst_dg_dev_add() - Add a device to a device group.
*
* It is verified whether 'name' refers to an existing device and whether that
@@ -1217,7 +1217,7 @@ static void __scst_dg_dev_remove(struct scst_dev_group *dg,
kfree(dgdev);
}
-/**
+/*
* scst_dg_dev_remove_by_name() - Remove a device from a device group.
*/
int scst_dg_dev_remove_by_name(struct scst_dev_group *dg, const char *name)
@@ -1284,7 +1284,7 @@ static struct kobj_type scst_dg_ktype = {
.release = scst_release_dg,
};
-/**
+/*
* scst_dg_add() - Add a new device group object and make it visible in sysfs.
*/
int scst_dg_add(struct kobject *parent, const char *name)
@@ -1664,7 +1664,7 @@ static void scst_stpg_ext_blocking_done(struct scst_device *dev,
scst_stpg_check_blocking_done(*((struct scst_stpg_wait **)data));
}
-/**
+/*
* scst_tg_set_group_info - SET TARGET PORT GROUPS implementation.
*
* Returns >=0 upon success or negative error code otherwise, for instance,
diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c
index 1616a7ca4..ab5291bc9 100644
--- a/scst_local/scst_local.c
+++ b/scst_local/scst_local.c
@@ -348,7 +348,7 @@ static const char *scst_local_info(struct Scsi_Host *shp)
#else /* CONFIG_SCST_PROC */
-/**
+/*
** Tgtt attributes
**/
@@ -395,7 +395,7 @@ static const struct attribute *scst_local_tgtt_attrs[] = {
NULL,
};
-/**
+/*
** Tgt attributes
**/
@@ -539,7 +539,7 @@ static const struct attribute *scst_local_tgt_attrs[] = {
NULL,
};
-/**
+/*
** Session attributes
**/
diff --git a/srpt/src/ib_srpt.h b/srpt/src/ib_srpt.h
index a956d1827..62a5eccd0 100644
--- a/srpt/src/ib_srpt.h
+++ b/srpt/src/ib_srpt.h
@@ -469,7 +469,6 @@ struct srpt_device {
struct ib_event_handler event_handler;
};
-#if 0
/**
* struct srp_login_req_rdma - RDMA/CM login parameters.
*
@@ -490,4 +489,3 @@ struct srp_login_req_rdma {
};
#endif /* IB_SRPT_H */
-#endif