diff options
author | Tejun Heo <tj@kernel.org> | 2010-05-15 14:09:30 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-05-21 14:01:02 -0400 |
commit | 1493bf217f7f59a5d9e2095a7dbcec00fb36ca8b (patch) | |
tree | 9c03b0bd903a338d061958f8d65d196b14c81376 /fs/partitions/check.h | |
parent | c3e33e043f5e9c583aa59d5591a614b2a8243d3a (diff) |
block: use struct parsed_partitions *state universally in partition check code
Make the following changes to partition check code.
* Add ->bdev to struct parsed_partitions.
* Introduce read_part_sector() which is a simple wrapper around
read_dev_sector() which takes struct parsed_partitions *state
instead of @bdev.
* For functions which used to take @state and @bdev, drop @bdev. For
functions which used to take @bdev, replace it with @state.
* While updating, drop superflous checks on NULL state/bdev in ldm.c.
This cleans up the API a bit and enables better handling of IO errors
during partition check as the generic partition check code now has
much better visibility into what went wrong in the low level code
paths.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/partitions/check.h')
-rw-r--r-- | fs/partitions/check.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/partitions/check.h b/fs/partitions/check.h index 98dbe1a84528..4b31a97775be 100644 --- a/fs/partitions/check.h +++ b/fs/partitions/check.h | |||
@@ -6,6 +6,7 @@ | |||
6 | * description. | 6 | * description. |
7 | */ | 7 | */ |
8 | struct parsed_partitions { | 8 | struct parsed_partitions { |
9 | struct block_device *bdev; | ||
9 | char name[BDEVNAME_SIZE]; | 10 | char name[BDEVNAME_SIZE]; |
10 | struct { | 11 | struct { |
11 | sector_t from; | 12 | sector_t from; |
@@ -16,6 +17,12 @@ struct parsed_partitions { | |||
16 | int limit; | 17 | int limit; |
17 | }; | 18 | }; |
18 | 19 | ||
20 | static inline void *read_part_sector(struct parsed_partitions *state, | ||
21 | sector_t n, Sector *p) | ||
22 | { | ||
23 | return read_dev_sector(state->bdev, n, p); | ||
24 | } | ||
25 | |||
19 | static inline void | 26 | static inline void |
20 | put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size) | 27 | put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size) |
21 | { | 28 | { |