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
521c3768
Commit
521c3768
authored
Oct 02, 2002
by
Alexander Viro
Committed by
Linus Torvalds
Oct 02, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] loop.c switched to dynamic allocation
parent
00684492
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
10 deletions
+18
-10
drivers/block/loop.c
drivers/block/loop.c
+18
-10
No files found.
drivers/block/loop.c
View file @
521c3768
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
static
int
max_loop
=
8
;
static
int
max_loop
=
8
;
static
struct
loop_device
*
loop_dev
;
static
struct
loop_device
*
loop_dev
;
static
struct
gendisk
*
disks
;
static
struct
gendisk
*
*
disks
;
static
devfs_handle_t
devfs_handle
;
/* For the directory */
static
devfs_handle_t
devfs_handle
;
/* For the directory */
/*
/*
...
@@ -159,9 +159,7 @@ struct loop_func_table *xfer_funcs[MAX_LO_CRYPT] = {
...
@@ -159,9 +159,7 @@ struct loop_func_table *xfer_funcs[MAX_LO_CRYPT] = {
static
void
figure_loop_size
(
struct
loop_device
*
lo
)
static
void
figure_loop_size
(
struct
loop_device
*
lo
)
{
{
loff_t
size
=
lo
->
lo_backing_file
->
f_dentry
->
d_inode
->
i_size
;
loff_t
size
=
lo
->
lo_backing_file
->
f_dentry
->
d_inode
->
i_size
;
set_capacity
(
disks
[
lo
->
lo_number
],
(
size
-
lo
->
lo_offset
)
>>
9
);
set_capacity
(
disks
+
lo
->
lo_number
,
(
size
-
lo
->
lo_offset
)
>>
9
);
}
}
static
inline
int
lo_do_transfer
(
struct
loop_device
*
lo
,
int
cmd
,
char
*
rbuf
,
static
inline
int
lo_do_transfer
(
struct
loop_device
*
lo
,
int
cmd
,
char
*
rbuf
,
...
@@ -809,7 +807,7 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
...
@@ -809,7 +807,7 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
memset
(
lo
->
lo_encrypt_key
,
0
,
LO_KEY_SIZE
);
memset
(
lo
->
lo_encrypt_key
,
0
,
LO_KEY_SIZE
);
memset
(
lo
->
lo_name
,
0
,
LO_NAME_SIZE
);
memset
(
lo
->
lo_name
,
0
,
LO_NAME_SIZE
);
invalidate_bdev
(
bdev
,
0
);
invalidate_bdev
(
bdev
,
0
);
set_capacity
(
disks
+
lo
->
lo_number
,
0
);
set_capacity
(
disks
[
lo
->
lo_number
]
,
0
);
filp
->
f_dentry
->
d_inode
->
i_mapping
->
gfp_mask
=
gfp
;
filp
->
f_dentry
->
d_inode
->
i_mapping
->
gfp_mask
=
gfp
;
lo
->
lo_state
=
Lo_unbound
;
lo
->
lo_state
=
Lo_unbound
;
fput
(
filp
);
fput
(
filp
);
...
@@ -1048,20 +1046,25 @@ int __init loop_init(void)
...
@@ -1048,20 +1046,25 @@ int __init loop_init(void)
if
(
!
loop_dev
)
if
(
!
loop_dev
)
return
-
ENOMEM
;
return
-
ENOMEM
;
disks
=
kmalloc
(
max_loop
*
sizeof
(
struct
gendisk
),
GFP_KERNEL
);
disks
=
kmalloc
(
max_loop
*
sizeof
(
struct
gendisk
*
),
GFP_KERNEL
);
if
(
!
disks
)
if
(
!
disks
)
goto
out_mem
;
goto
out_mem
;
for
(
i
=
0
;
i
<
max_loop
;
i
++
)
{
disks
[
i
]
=
alloc_disk
();
if
(
!
disks
[
i
])
goto
out_mem2
;
}
for
(
i
=
0
;
i
<
max_loop
;
i
++
)
{
for
(
i
=
0
;
i
<
max_loop
;
i
++
)
{
struct
loop_device
*
lo
=
&
loop_dev
[
i
];
struct
loop_device
*
lo
=
&
loop_dev
[
i
];
struct
gendisk
*
disk
=
disks
+
i
;
struct
gendisk
*
disk
=
disks
[
i
]
;
memset
(
lo
,
0
,
sizeof
(
struct
loop_device
));
memset
(
lo
,
0
,
sizeof
(
struct
loop_device
));
init_MUTEX
(
&
lo
->
lo_ctl_mutex
);
init_MUTEX
(
&
lo
->
lo_ctl_mutex
);
init_MUTEX_LOCKED
(
&
lo
->
lo_sem
);
init_MUTEX_LOCKED
(
&
lo
->
lo_sem
);
init_MUTEX_LOCKED
(
&
lo
->
lo_bh_mutex
);
init_MUTEX_LOCKED
(
&
lo
->
lo_bh_mutex
);
lo
->
lo_number
=
i
;
lo
->
lo_number
=
i
;
spin_lock_init
(
&
lo
->
lo_lock
);
spin_lock_init
(
&
lo
->
lo_lock
);
memset
(
disk
,
0
,
sizeof
(
struct
gendisk
));
disk
->
major
=
LOOP_MAJOR
;
disk
->
major
=
LOOP_MAJOR
;
disk
->
first_minor
=
i
;
disk
->
first_minor
=
i
;
disk
->
fops
=
&
lo_fops
;
disk
->
fops
=
&
lo_fops
;
...
@@ -1074,6 +1077,9 @@ int __init loop_init(void)
...
@@ -1074,6 +1077,9 @@ int __init loop_init(void)
printk
(
KERN_INFO
"loop: loaded (max %d devices)
\n
"
,
max_loop
);
printk
(
KERN_INFO
"loop: loaded (max %d devices)
\n
"
,
max_loop
);
return
0
;
return
0
;
out_mem2:
while
(
i
--
)
put_disk
(
disks
[
i
]);
out_mem:
out_mem:
kfree
(
disks
);
kfree
(
disks
);
kfree
(
loop_dev
);
kfree
(
loop_dev
);
...
@@ -1084,8 +1090,10 @@ int __init loop_init(void)
...
@@ -1084,8 +1090,10 @@ int __init loop_init(void)
void
loop_exit
(
void
)
void
loop_exit
(
void
)
{
{
int
i
;
int
i
;
for
(
i
=
0
;
i
<
max_loop
;
i
++
)
for
(
i
=
0
;
i
<
max_loop
;
i
++
)
{
del_gendisk
(
disks
+
i
);
del_gendisk
(
disks
[
i
]);
put_disk
(
disks
[
i
]);
}
devfs_unregister
(
devfs_handle
);
devfs_unregister
(
devfs_handle
);
if
(
unregister_blkdev
(
MAJOR_NR
,
"loop"
))
if
(
unregister_blkdev
(
MAJOR_NR
,
"loop"
))
printk
(
KERN_WARNING
"loop: cannot unregister blkdev
\n
"
);
printk
(
KERN_WARNING
"loop: cannot unregister blkdev
\n
"
);
...
...
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