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
e1240137
Commit
e1240137
authored
Jun 08, 2003
by
Joe Thornber
Committed by
Greg Kroah-Hartman
Jun 08, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] dm: Replace __HIGH() and __LOW() macros
Replace __HIGH() and __LOW() with max() and min_not_zero().
parent
18234c8b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
45 additions
and
16 deletions
+45
-16
drivers/md/dm-table.c
drivers/md/dm-table.c
+45
-16
No files found.
drivers/md/dm-table.c
View file @
e1240137
...
@@ -78,22 +78,33 @@ static unsigned int int_log(unsigned long n, unsigned long base)
...
@@ -78,22 +78,33 @@ static unsigned int int_log(unsigned long n, unsigned long base)
return
result
;
return
result
;
}
}
#define __HIGH(l, r) if (*(l) < (r)) *(l) = (r)
/*
#define __LOW(l, r) if (*(l) == 0 || *(l) > (r)) *(l) = (r)
* Returns the minimum that is _not_ zero, unless both are zero.
*/
#define min_not_zero(l, r) (l == 0) ? r : ((r == 0) ? l : min(l, r))
/*
/*
* Combine two io_restrictions, always taking the lower value.
* Combine two io_restrictions, always taking the lower value.
*/
*/
static
void
combine_restrictions_low
(
struct
io_restrictions
*
lhs
,
static
void
combine_restrictions_low
(
struct
io_restrictions
*
lhs
,
struct
io_restrictions
*
rhs
)
struct
io_restrictions
*
rhs
)
{
{
__LOW
(
&
lhs
->
max_sectors
,
rhs
->
max_sectors
);
lhs
->
max_sectors
=
__LOW
(
&
lhs
->
max_phys_segments
,
rhs
->
max_phys_segments
);
min_not_zero
(
lhs
->
max_sectors
,
rhs
->
max_sectors
);
__LOW
(
&
lhs
->
max_hw_segments
,
rhs
->
max_hw_segments
);
__HIGH
(
&
lhs
->
hardsect_size
,
rhs
->
hardsect_size
);
lhs
->
max_phys_segments
=
__LOW
(
&
lhs
->
max_segment_size
,
rhs
->
max_segment_size
);
min_not_zero
(
lhs
->
max_phys_segments
,
rhs
->
max_phys_segments
);
__LOW
(
&
lhs
->
seg_boundary_mask
,
rhs
->
seg_boundary_mask
);
lhs
->
max_hw_segments
=
min_not_zero
(
lhs
->
max_hw_segments
,
rhs
->
max_hw_segments
);
lhs
->
hardsect_size
=
max
(
lhs
->
hardsect_size
,
rhs
->
hardsect_size
);
lhs
->
max_segment_size
=
min_not_zero
(
lhs
->
max_segment_size
,
rhs
->
max_segment_size
);
lhs
->
seg_boundary_mask
=
min_not_zero
(
lhs
->
seg_boundary_mask
,
rhs
->
seg_boundary_mask
);
}
}
/*
/*
...
@@ -481,13 +492,31 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
...
@@ -481,13 +492,31 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
request_queue_t
*
q
=
bdev_get_queue
((
*
result
)
->
bdev
);
request_queue_t
*
q
=
bdev_get_queue
((
*
result
)
->
bdev
);
struct
io_restrictions
*
rs
=
&
ti
->
limits
;
struct
io_restrictions
*
rs
=
&
ti
->
limits
;
/* combine the device limits low */
/*
__LOW
(
&
rs
->
max_sectors
,
q
->
max_sectors
);
* Combine the device limits low.
__LOW
(
&
rs
->
max_phys_segments
,
q
->
max_phys_segments
);
*
__LOW
(
&
rs
->
max_hw_segments
,
q
->
max_hw_segments
);
* FIXME: if we move an io_restriction struct
__HIGH
(
&
rs
->
hardsect_size
,
q
->
hardsect_size
);
* into q this would just be a call to
__LOW
(
&
rs
->
max_segment_size
,
q
->
max_segment_size
);
* combine_restrictions_low()
__LOW
(
&
rs
->
seg_boundary_mask
,
q
->
seg_boundary_mask
);
*/
rs
->
max_sectors
=
min_not_zero
(
rs
->
max_sectors
,
q
->
max_sectors
);
rs
->
max_phys_segments
=
min_not_zero
(
rs
->
max_phys_segments
,
q
->
max_phys_segments
);
rs
->
max_hw_segments
=
min_not_zero
(
rs
->
max_hw_segments
,
q
->
max_hw_segments
);
rs
->
hardsect_size
=
max
(
rs
->
hardsect_size
,
q
->
hardsect_size
);
rs
->
max_segment_size
=
min_not_zero
(
rs
->
max_segment_size
,
q
->
max_segment_size
);
rs
->
seg_boundary_mask
=
min_not_zero
(
rs
->
seg_boundary_mask
,
q
->
seg_boundary_mask
);
}
}
return
r
;
return
r
;
...
...
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