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
Kirill Smelkov
linux
Commits
5471b3aa
Commit
5471b3aa
authored
21 years ago
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
http://jfs.bkbits.net/linux-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
30280a06
8699fb44
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
drivers/block/ll_rw_blk.c
drivers/block/ll_rw_blk.c
+4
-2
No files found.
drivers/block/ll_rw_blk.c
View file @
5471b3aa
...
...
@@ -2164,8 +2164,7 @@ int end_that_request_chunk(struct request *req, int uptodate, int nr_bytes)
void
end_that_request_last
(
struct
request
*
req
)
{
struct
gendisk
*
disk
=
req
->
rq_disk
;
if
(
req
->
waiting
)
complete
(
req
->
waiting
);
struct
completion
*
waiting
=
req
->
waiting
;
if
(
disk
)
{
unsigned
long
duration
=
jiffies
-
req
->
start_time
;
...
...
@@ -2183,6 +2182,9 @@ void end_that_request_last(struct request *req)
disk_stat_dec
(
disk
,
in_flight
);
}
__blk_put_request
(
req
->
q
,
req
);
/* Do this LAST! The structure may be freed immediately afterwards */
if
(
waiting
)
complete
(
waiting
);
}
int
__init
blk_dev_init
(
void
)
...
...
This diff is collapsed.
Click to expand it.
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