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
47c00dcd
Commit
47c00dcd
authored
Nov 15, 2023
by
Mike Snitzer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dm thin: add braces around conditional code that spans lines
Signed-off-by:
Mike Snitzer
<
snitzer@kernel.org
>
parent
0e0c50e8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
drivers/md/dm-thin.c
drivers/md/dm-thin.c
+12
-8
No files found.
drivers/md/dm-thin.c
View file @
47c00dcd
...
@@ -453,12 +453,13 @@ static int bio_detain(struct pool *pool, struct dm_cell_key *key, struct bio *bi
...
@@ -453,12 +453,13 @@ static int bio_detain(struct pool *pool, struct dm_cell_key *key, struct bio *bi
cell_prealloc
=
dm_bio_prison_alloc_cell
(
pool
->
prison
,
GFP_NOIO
);
cell_prealloc
=
dm_bio_prison_alloc_cell
(
pool
->
prison
,
GFP_NOIO
);
r
=
dm_bio_detain
(
pool
->
prison
,
key
,
bio
,
cell_prealloc
,
cell_result
);
r
=
dm_bio_detain
(
pool
->
prison
,
key
,
bio
,
cell_prealloc
,
cell_result
);
if
(
r
)
if
(
r
)
{
/*
/*
* We reused an old cell; we can get rid of
* We reused an old cell; we can get rid of
* the new one.
* the new one.
*/
*/
dm_bio_prison_free_cell
(
pool
->
prison
,
cell_prealloc
);
dm_bio_prison_free_cell
(
pool
->
prison
,
cell_prealloc
);
}
return
r
;
return
r
;
}
}
...
@@ -707,9 +708,10 @@ static void get_bio_block_range(struct thin_c *tc, struct bio *bio,
...
@@ -707,9 +708,10 @@ static void get_bio_block_range(struct thin_c *tc, struct bio *bio,
(
void
)
sector_div
(
e
,
pool
->
sectors_per_block
);
(
void
)
sector_div
(
e
,
pool
->
sectors_per_block
);
}
}
if
(
e
<
b
)
if
(
e
<
b
)
{
/* Can happen if the bio is within a single block. */
/* Can happen if the bio is within a single block. */
e
=
b
;
e
=
b
;
}
*
begin
=
b
;
*
begin
=
b
;
*
end
=
e
;
*
end
=
e
;
...
@@ -721,13 +723,14 @@ static void remap(struct thin_c *tc, struct bio *bio, dm_block_t block)
...
@@ -721,13 +723,14 @@ static void remap(struct thin_c *tc, struct bio *bio, dm_block_t block)
sector_t
bi_sector
=
bio
->
bi_iter
.
bi_sector
;
sector_t
bi_sector
=
bio
->
bi_iter
.
bi_sector
;
bio_set_dev
(
bio
,
tc
->
pool_dev
->
bdev
);
bio_set_dev
(
bio
,
tc
->
pool_dev
->
bdev
);
if
(
block_size_is_power_of_two
(
pool
))
if
(
block_size_is_power_of_two
(
pool
))
{
bio
->
bi_iter
.
bi_sector
=
bio
->
bi_iter
.
bi_sector
=
(
block
<<
pool
->
sectors_per_block_shift
)
|
(
block
<<
pool
->
sectors_per_block_shift
)
|
(
bi_sector
&
(
pool
->
sectors_per_block
-
1
));
(
bi_sector
&
(
pool
->
sectors_per_block
-
1
));
else
}
else
{
bio
->
bi_iter
.
bi_sector
=
(
block
*
pool
->
sectors_per_block
)
+
bio
->
bi_iter
.
bi_sector
=
(
block
*
pool
->
sectors_per_block
)
+
sector_div
(
bi_sector
,
pool
->
sectors_per_block
);
sector_div
(
bi_sector
,
pool
->
sectors_per_block
);
}
}
}
static
void
remap_to_origin
(
struct
thin_c
*
tc
,
struct
bio
*
bio
)
static
void
remap_to_origin
(
struct
thin_c
*
tc
,
struct
bio
*
bio
)
...
@@ -1401,9 +1404,10 @@ static void schedule_zero(struct thin_c *tc, dm_block_t virt_block,
...
@@ -1401,9 +1404,10 @@ static void schedule_zero(struct thin_c *tc, dm_block_t virt_block,
if
(
pool
->
pf
.
zero_new_blocks
)
{
if
(
pool
->
pf
.
zero_new_blocks
)
{
if
(
io_overwrites_block
(
pool
,
bio
))
if
(
io_overwrites_block
(
pool
,
bio
))
remap_and_issue_overwrite
(
tc
,
bio
,
data_block
,
m
);
remap_and_issue_overwrite
(
tc
,
bio
,
data_block
,
m
);
else
else
{
ll_zero
(
tc
,
m
,
data_block
*
pool
->
sectors_per_block
,
ll_zero
(
tc
,
m
,
data_block
*
pool
->
sectors_per_block
,
(
data_block
+
1
)
*
pool
->
sectors_per_block
);
(
data_block
+
1
)
*
pool
->
sectors_per_block
);
}
}
else
}
else
process_prepared_mapping
(
m
);
process_prepared_mapping
(
m
);
}
}
...
@@ -1416,17 +1420,17 @@ static void schedule_external_copy(struct thin_c *tc, dm_block_t virt_block,
...
@@ -1416,17 +1420,17 @@ static void schedule_external_copy(struct thin_c *tc, dm_block_t virt_block,
sector_t
virt_block_begin
=
virt_block
*
pool
->
sectors_per_block
;
sector_t
virt_block_begin
=
virt_block
*
pool
->
sectors_per_block
;
sector_t
virt_block_end
=
(
virt_block
+
1
)
*
pool
->
sectors_per_block
;
sector_t
virt_block_end
=
(
virt_block
+
1
)
*
pool
->
sectors_per_block
;
if
(
virt_block_end
<=
tc
->
origin_size
)
if
(
virt_block_end
<=
tc
->
origin_size
)
{
schedule_copy
(
tc
,
virt_block
,
tc
->
origin_dev
,
schedule_copy
(
tc
,
virt_block
,
tc
->
origin_dev
,
virt_block
,
data_dest
,
cell
,
bio
,
virt_block
,
data_dest
,
cell
,
bio
,
pool
->
sectors_per_block
);
pool
->
sectors_per_block
);
else
if
(
virt_block_begin
<
tc
->
origin_size
)
}
else
if
(
virt_block_begin
<
tc
->
origin_size
)
{
schedule_copy
(
tc
,
virt_block
,
tc
->
origin_dev
,
schedule_copy
(
tc
,
virt_block
,
tc
->
origin_dev
,
virt_block
,
data_dest
,
cell
,
bio
,
virt_block
,
data_dest
,
cell
,
bio
,
tc
->
origin_size
-
virt_block_begin
);
tc
->
origin_size
-
virt_block_begin
);
else
}
else
schedule_zero
(
tc
,
virt_block
,
data_dest
,
cell
,
bio
);
schedule_zero
(
tc
,
virt_block
,
data_dest
,
cell
,
bio
);
}
}
...
...
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