Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
bcd039b2
Commit
bcd039b2
authored
Nov 18, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' of
git://brick.kernel.dk/data/git/linux-2.6-block
parents
e67b23c7
6f5a0f7c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
23 deletions
+29
-23
block/as-iosched.c
block/as-iosched.c
+0
-2
block/cfq-iosched.c
block/cfq-iosched.c
+0
-2
block/deadline-iosched.c
block/deadline-iosched.c
+0
-2
block/elevator.c
block/elevator.c
+0
-2
block/ll_rw_blk.c
block/ll_rw_blk.c
+0
-2
drivers/block/cciss.c
drivers/block/cciss.c
+28
-12
include/linux/cciss_ioctl.h
include/linux/cciss_ioctl.h
+1
-1
No files found.
block/as-iosched.c
View file @
bcd039b2
/*
* linux/drivers/block/as-iosched.c
*
* Anticipatory & deadline i/o scheduler.
*
* Copyright (C) 2002 Jens Axboe <axboe@suse.de>
...
...
block/cfq-iosched.c
View file @
bcd039b2
/*
* linux/drivers/block/cfq-iosched.c
*
* CFQ, or complete fairness queueing, disk scheduler.
*
* Based on ideas from a previously unfinished io
...
...
block/deadline-iosched.c
View file @
bcd039b2
/*
* linux/drivers/block/deadline-iosched.c
*
* Deadline i/o scheduler.
*
* Copyright (C) 2002 Jens Axboe <axboe@suse.de>
...
...
block/elevator.c
View file @
bcd039b2
/*
* linux/drivers/block/elevator.c
*
* Block device elevator/IO-scheduler.
*
* Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
...
...
block/ll_rw_blk.c
View file @
bcd039b2
/*
* linux/drivers/block/ll_rw_blk.c
*
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 1994, Karl Keyte: Added support for disk statistics
* Elevator latency, (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
...
...
drivers/block/cciss.c
View file @
bcd039b2
...
...
@@ -1017,10 +1017,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
status
=
-
ENOMEM
;
goto
cleanup1
;
}
if
(
ioc
->
Request
.
Type
.
Direction
==
XFER_WRITE
&&
copy_from_user
(
buff
[
sg_used
],
data_ptr
,
sz
))
{
if
(
ioc
->
Request
.
Type
.
Direction
==
XFER_WRITE
)
{
if
(
copy_from_user
(
buff
[
sg_used
],
data_ptr
,
sz
))
{
status
=
-
ENOMEM
;
goto
cleanup1
;
goto
cleanup1
;
}
}
else
{
memset
(
buff
[
sg_used
],
0
,
sz
);
}
...
...
@@ -1138,8 +1139,15 @@ static int revalidate_allvol(ctlr_info_t *host)
for
(
i
=
0
;
i
<
NWD
;
i
++
)
{
struct
gendisk
*
disk
=
host
->
gendisk
[
i
];
if
(
disk
->
flags
&
GENHD_FL_UP
)
del_gendisk
(
disk
);
if
(
disk
)
{
request_queue_t
*
q
=
disk
->
queue
;
if
(
disk
->
flags
&
GENHD_FL_UP
)
del_gendisk
(
disk
);
if
(
q
)
blk_cleanup_queue
(
q
);
put_disk
(
disk
);
}
}
/*
...
...
@@ -1453,10 +1461,13 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
* allows us to delete disk zero but keep the controller registered.
*/
if
(
h
->
gendisk
[
0
]
!=
disk
){
if
(
disk
->
flags
&
GENHD_FL_UP
){
blk_cleanup_queue
(
disk
->
queue
);
del_gendisk
(
disk
);
drv
->
queue
=
NULL
;
if
(
disk
)
{
request_queue_t
*
q
=
disk
->
queue
;
if
(
disk
->
flags
&
GENHD_FL_UP
)
del_gendisk
(
disk
);
if
(
q
)
blk_cleanup_queue
(
q
);
put_disk
(
disk
);
}
}
...
...
@@ -3225,9 +3236,14 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
/* remove it from the disk list */
for
(
j
=
0
;
j
<
NWD
;
j
++
)
{
struct
gendisk
*
disk
=
hba
[
i
]
->
gendisk
[
j
];
if
(
disk
->
flags
&
GENHD_FL_UP
)
{
del_gendisk
(
disk
);
blk_cleanup_queue
(
disk
->
queue
);
if
(
disk
)
{
request_queue_t
*
q
=
disk
->
queue
;
if
(
disk
->
flags
&
GENHD_FL_UP
)
del_gendisk
(
disk
);
if
(
q
)
blk_cleanup_queue
(
q
);
put_disk
(
disk
);
}
}
...
...
include/linux/cciss_ioctl.h
View file @
bcd039b2
...
...
@@ -10,8 +10,8 @@
typedef
struct
_cciss_pci_info_struct
{
unsigned
char
bus
;
unsigned
short
domain
;
unsigned
char
dev_fn
;
unsigned
short
domain
;
__u32
board_id
;
}
cciss_pci_info_struct
;
...
...
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