Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
ff682a3d
Commit
ff682a3d
authored
Nov 29, 2016
by
James Bottomley
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes
parents
c65c945c
2319f847
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
drivers/scsi/lpfc/lpfc_sli.c
drivers/scsi/lpfc/lpfc_sli.c
+8
-6
No files found.
drivers/scsi/lpfc/lpfc_sli.c
View file @
ff682a3d
...
@@ -1323,18 +1323,20 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
...
@@ -1323,18 +1323,20 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
{
{
lockdep_assert_held
(
&
phba
->
hbalock
);
lockdep_assert_held
(
&
phba
->
hbalock
);
BUG_ON
(
!
piocb
||
!
piocb
->
vport
);
BUG_ON
(
!
piocb
);
list_add_tail
(
&
piocb
->
list
,
&
pring
->
txcmplq
);
list_add_tail
(
&
piocb
->
list
,
&
pring
->
txcmplq
);
piocb
->
iocb_flag
|=
LPFC_IO_ON_TXCMPLQ
;
piocb
->
iocb_flag
|=
LPFC_IO_ON_TXCMPLQ
;
if
((
unlikely
(
pring
->
ringno
==
LPFC_ELS_RING
))
&&
if
((
unlikely
(
pring
->
ringno
==
LPFC_ELS_RING
))
&&
(
piocb
->
iocb
.
ulpCommand
!=
CMD_ABORT_XRI_CN
)
&&
(
piocb
->
iocb
.
ulpCommand
!=
CMD_ABORT_XRI_CN
)
&&
(
piocb
->
iocb
.
ulpCommand
!=
CMD_CLOSE_XRI_CN
)
&&
(
piocb
->
iocb
.
ulpCommand
!=
CMD_CLOSE_XRI_CN
))
{
(
!
(
piocb
->
vport
->
load_flag
&
FC_UNLOADING
)))
BUG_ON
(
!
piocb
->
vport
);
mod_timer
(
&
piocb
->
vport
->
els_tmofunc
,
if
(
!
(
piocb
->
vport
->
load_flag
&
FC_UNLOADING
))
jiffies
+
mod_timer
(
&
piocb
->
vport
->
els_tmofunc
,
msecs_to_jiffies
(
1000
*
(
phba
->
fc_ratov
<<
1
)));
jiffies
+
msecs_to_jiffies
(
1000
*
(
phba
->
fc_ratov
<<
1
)));
}
return
0
;
return
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment