diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-15 19:59:00 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-15 19:59:00 -0400 |
| commit | 08848e446bcd2130c26945be966446389d25bcc2 (patch) | |
| tree | e31e6ec7a1d9e8f6bbf8cdee2692eb42f4869f47 /include/linux/raid/bitmap.h | |
| parent | 46906c4415f88cebfad530917bada0835d651824 (diff) | |
| parent | 38d84c3bd6dd22bdb1f797c87006931133d71aea (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/linux/raid/bitmap.h')
| -rw-r--r-- | include/linux/raid/bitmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/raid/bitmap.h b/include/linux/raid/bitmap.h index e24b74b11150..6213e976eade 100644 --- a/include/linux/raid/bitmap.h +++ b/include/linux/raid/bitmap.h | |||
| @@ -262,7 +262,7 @@ void bitmap_write_all(struct bitmap *bitmap); | |||
| 262 | int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors); | 262 | int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors); |
| 263 | void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors, | 263 | void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors, |
| 264 | int success); | 264 | int success); |
| 265 | int bitmap_start_sync(struct bitmap *bitmap, sector_t offset, int *blocks); | 265 | int bitmap_start_sync(struct bitmap *bitmap, sector_t offset, int *blocks, int degraded); |
| 266 | void bitmap_end_sync(struct bitmap *bitmap, sector_t offset, int *blocks, int aborted); | 266 | void bitmap_end_sync(struct bitmap *bitmap, sector_t offset, int *blocks, int aborted); |
| 267 | void bitmap_close_sync(struct bitmap *bitmap); | 267 | void bitmap_close_sync(struct bitmap *bitmap); |
| 268 | 268 | ||