qiurui
/
linux-kernelorg-stable
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: libfc: Replace ->seq_release callback with function call 

The ->seq_release callback only ever had one implementation,
so call the function directly and drop the callback.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2016-10-18 10:01:54 +02:00 committed by Martin K. Petersen
parent 96d564e24a
commit 9625cc483b
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/libfc/fc_exch.c
View File

@ -1497,10 +1497,11 @@ EXPORT_SYMBOL(fc_seq_assign);
* fc_seq_release() - Release the hold * fc_seq_release() - Release the hold
* @sp: The sequence. * @sp: The sequence.
*/ */
static void fc_seq_release(struct fc_seq *sp) void fc_seq_release(struct fc_seq *sp)
{ {
fc_exch_release(fc_seq_exch(sp)); fc_exch_release(fc_seq_exch(sp));
} }
EXPORT_SYMBOL(fc_seq_release);
/** /**
* fc_exch_recv_req() - Handler for an incoming request * fc_exch_recv_req() - Handler for an incoming request
@ -2654,9 +2655,6 @@ int fc_exch_init(struct fc_lport *lport)
if (!lport->tt.exch_mgr_reset) if (!lport->tt.exch_mgr_reset)
lport->tt.exch_mgr_reset = fc_exch_mgr_reset; lport->tt.exch_mgr_reset = fc_exch_mgr_reset;
if (!lport->tt.seq_release)
lport->tt.seq_release = fc_seq_release;
return 0; return 0;
} }
EXPORT_SYMBOL(fc_exch_init); EXPORT_SYMBOL(fc_exch_init);

2
drivers/target/tcm_fc/tfc_cmd.c
View File

@ -92,7 +92,7 @@ static void ft_free_cmd(struct ft_cmd *cmd)
fp = cmd->req_frame; fp = cmd->req_frame;
lport = fr_dev(fp); lport = fr_dev(fp);
if (fr_seq(fp)) if (fr_seq(fp))
lport->tt.seq_release(fr_seq(fp)); fc_seq_release(fr_seq(fp));
fc_frame_free(fp); fc_frame_free(fp);
percpu_ida_free(&sess->se_sess->sess_tag_pool, cmd->se_cmd.map_tag); percpu_ida_free(&sess->se_sess->sess_tag_pool, cmd->se_cmd.map_tag);
ft_sess_put(sess); /* undo get from lookup at recv */ ft_sess_put(sess); /* undo get from lookup at recv */

8
include/scsi/libfc.h
View File

@ -514,13 +514,6 @@ struct libfc_function_template {
*/ */
void (*get_lesb)(struct fc_lport *, struct fc_els_lesb *lesb); void (*get_lesb)(struct fc_lport *, struct fc_els_lesb *lesb);
/*
* Release the reference on the sequence returned by seq_assign().
*
* STATUS: OPTIONAL
*/
void (*seq_release)(struct fc_seq *);
/* /*
* Reset an exchange manager, completing all sequences and exchanges. * Reset an exchange manager, completing all sequences and exchanges.
* If s_id is non-zero, reset only exchanges originating from that FID. * If s_id is non-zero, reset only exchanges originating from that FID.
@ -1000,6 +993,7 @@ void fc_seq_set_resp(struct fc_seq *sp,
void (*resp)(struct fc_seq *, struct fc_frame *, void *), void (*resp)(struct fc_seq *, struct fc_frame *, void *),
void *arg); void *arg);
struct fc_seq *fc_seq_assign(struct fc_lport *lport, struct fc_frame *fp); struct fc_seq *fc_seq_assign(struct fc_lport *lport, struct fc_frame *fp);
void fc_seq_release(struct fc_seq *sp);
struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *, struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *,
struct fc_exch_mgr *, struct fc_exch_mgr *,
bool (*match)(struct fc_frame *)); bool (*match)(struct fc_frame *));