[DRBD-cvs] svn commit by lars - r2996 - in
branches/drbd-8.0-for-linus/drbd: . linux -
1a7a493aafb9a6d16b62253a7724acf5dfa4a434 get rid of typ
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Tue Jul 24 16:15:40 CEST 2007
Author: lars
Date: 2007-07-24 16:15:33 +0200 (Tue, 24 Jul 2007)
New Revision: 2996
Modified:
branches/drbd-8.0-for-linus/drbd/drbd_actlog.c
branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c
branches/drbd-8.0-for-linus/drbd/drbd_int.h
branches/drbd-8.0-for-linus/drbd/drbd_main.c
branches/drbd-8.0-for-linus/drbd/drbd_nl.c
branches/drbd-8.0-for-linus/drbd/drbd_proc.c
branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
branches/drbd-8.0-for-linus/drbd/drbd_req.c
branches/drbd-8.0-for-linus/drbd/drbd_req.h
branches/drbd-8.0-for-linus/drbd/drbd_strings.c
branches/drbd-8.0-for-linus/drbd/drbd_worker.c
branches/drbd-8.0-for-linus/drbd/drbd_wrappers.h
branches/drbd-8.0-for-linus/drbd/linux/drbd.h
branches/drbd-8.0-for-linus/drbd/lru_cache.c
Log:
1a7a493aafb9a6d16b62253a7724acf5dfa4a434 get rid of typedefs, done
461d3d369db8379eb6f218b6c84fdf432c9bd855 get rid of typedefs, first round
Modified: branches/drbd-8.0-for-linus/drbd/drbd_actlog.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_actlog.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_actlog.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -34,10 +34,10 @@
* ;)
* this is mostly from drivers/md/md.c
*/
-STATIC int _drbd_md_sync_page_io(drbd_dev *mdev,
- struct drbd_backing_dev *bdev,
- struct page *page, sector_t sector,
- int rw, int size)
+int _drbd_md_sync_page_io(struct drbd_conf *mdev,
+ struct drbd_backing_dev *bdev,
+ struct page *page, sector_t sector,
+ int rw, int size)
{
struct bio *bio = bio_alloc(GFP_NOIO, 1);
struct completion event;
@@ -69,7 +69,7 @@
return ok;
}
-int drbd_md_sync_page_io(drbd_dev *mdev, struct drbd_backing_dev *bdev,
+int drbd_md_sync_page_io(struct drbd_conf *mdev, struct drbd_backing_dev *bdev,
sector_t sector, int rw)
{
int hardsect, mask, ok, offset = 0;
@@ -180,10 +180,10 @@
unsigned int enr;
};
-STATIC int w_al_write_transaction(struct Drbd_Conf *, struct drbd_work *, int);
+int w_al_write_transaction(struct drbd_conf *, struct drbd_work *, int);
static inline
-struct lc_element *_al_get(struct Drbd_Conf *mdev, unsigned int enr)
+struct lc_element *_al_get(struct drbd_conf *mdev, unsigned int enr)
{
struct lc_element *al_ext;
struct bm_extent *bm_ext;
@@ -216,7 +216,7 @@
/* FIXME
* this should be able to return failure when meta data update has failed.
*/
-void drbd_al_begin_io(struct Drbd_Conf *mdev, sector_t sector)
+void drbd_al_begin_io(struct drbd_conf *mdev, sector_t sector)
{
unsigned int enr = (sector >> (AL_EXTENT_SIZE_B-9));
struct lc_element *al_ext;
@@ -266,7 +266,7 @@
}
}
-void drbd_al_complete_io(struct Drbd_Conf *mdev, sector_t sector)
+void drbd_al_complete_io(struct drbd_conf *mdev, sector_t sector)
{
unsigned int enr = (sector >> (AL_EXTENT_SIZE_B-9));
struct lc_element *extent;
@@ -294,8 +294,8 @@
spin_unlock_irqrestore(&mdev->al_lock, flags);
}
-STATIC int
-w_al_write_transaction(struct Drbd_Conf *mdev, struct drbd_work *w, int unused)
+int
+w_al_write_transaction(struct drbd_conf *mdev, struct drbd_work *w, int unused)
{
int i, n, mx;
unsigned int extent_nr;
@@ -368,10 +368,10 @@
* Returns -1 on IO error, 0 on checksum error and 1 if it is a valid
* record.
*/
-STATIC int drbd_al_read_tr(struct Drbd_Conf *mdev,
- struct drbd_backing_dev *bdev,
- struct al_transaction *b,
- int index)
+int drbd_al_read_tr(struct drbd_conf *mdev,
+ struct drbd_backing_dev *bdev,
+ struct al_transaction *b,
+ int index)
{
sector_t sector;
int rv, i;
@@ -398,7 +398,7 @@
* representation. Returns 1 on success, returns 0 when
* reading the log failed due to IO errors.
*/
-int drbd_al_read_log(struct Drbd_Conf *mdev, struct drbd_backing_dev *bdev)
+int drbd_al_read_log(struct drbd_conf *mdev, struct drbd_backing_dev *bdev)
{
struct al_transaction *buffer;
int from = -1, to = -1, i, cnr, overflow = 0, rv;
@@ -504,14 +504,14 @@
struct drbd_atodb_wait {
atomic_t count;
struct completion io_done;
- struct Drbd_Conf *mdev;
+ struct drbd_conf *mdev;
int error;
};
-STATIC int atodb_endio(struct bio *bio, unsigned int bytes_done, int error)
+int atodb_endio(struct bio *bio, unsigned int bytes_done, int error)
{
struct drbd_atodb_wait *wc = bio->bi_private;
- struct Drbd_Conf *mdev = wc->mdev;
+ struct drbd_conf *mdev = wc->mdev;
struct page *page;
int uptodate = bio_flagged(bio, BIO_UPTODATE);
@@ -542,7 +542,7 @@
#define S2W(s) ((s)<<(BM_EXT_SIZE_B-BM_BLOCK_SIZE_B-LN2_BPL))
/* activity log to on disk bitmap -- prepare bio unless that sector
* is already covered by previously prepared bios */
-STATIC int atodb_prepare_unless_covered(struct Drbd_Conf *mdev,
+int atodb_prepare_unless_covered(struct drbd_conf *mdev,
struct bio **bios,
struct page **page,
unsigned int *page_offset,
@@ -611,7 +611,7 @@
* called when we detach (unconfigure) local storage,
* or when we go from Primary to Secondary state.
*/
-void drbd_al_to_on_disk_bm(struct Drbd_Conf *mdev)
+void drbd_al_to_on_disk_bm(struct drbd_conf *mdev)
{
int i, nr_elements;
unsigned int enr;
@@ -707,7 +707,7 @@
* drbd_al_apply_to_bm: Sets the bits in the bitmap that are described
* by the active extents of the AL.
*/
-void drbd_al_apply_to_bm(struct Drbd_Conf *mdev)
+void drbd_al_apply_to_bm(struct drbd_conf *mdev)
{
unsigned int enr;
unsigned long add = 0;
@@ -729,7 +729,7 @@
ppsize(ppb, Bit2KB(add)));
}
-static inline int _try_lc_del(struct Drbd_Conf *mdev, struct lc_element *al_ext)
+static inline int _try_lc_del(struct drbd_conf *mdev, struct lc_element *al_ext)
{
int rv;
@@ -748,7 +748,7 @@
* write any transactions)
* You need to lock mdev->act_log with lc_try_lock() / lc_unlock()
*/
-void drbd_al_shrink(struct Drbd_Conf *mdev)
+void drbd_al_shrink(struct drbd_conf *mdev)
{
struct lc_element *al_ext;
int i;
@@ -764,7 +764,7 @@
wake_up(&mdev->al_wait);
}
-STATIC int w_update_odbm(drbd_dev *mdev, struct drbd_work *w, int unused)
+int w_update_odbm(struct drbd_conf *mdev, struct drbd_work *w, int unused)
{
struct update_odbm_work *udw = (struct update_odbm_work *)w;
@@ -798,7 +798,7 @@
*
* TODO will be obsoleted once we have a caching lru of the on disk bitmap
*/
-STATIC void drbd_try_clear_on_disk_bm(struct Drbd_Conf *mdev, sector_t sector,
+void drbd_try_clear_on_disk_bm(struct drbd_conf *mdev, sector_t sector,
int count, int success)
{
struct bm_extent *ext;
@@ -885,7 +885,7 @@
* called by worker on SyncTarget and receiver on SyncSource.
*
*/
-void __drbd_set_in_sync(drbd_dev *mdev, sector_t sector, int size, const char *file, const unsigned int line)
+void __drbd_set_in_sync(struct drbd_conf *mdev, sector_t sector, int size, const char *file, const unsigned int line)
{
/* Is called from worker and receiver context _only_ */
unsigned long sbnr, ebnr, lbnr, bnr;
@@ -963,7 +963,7 @@
* called by tl_clear and drbd_send_dblock (==drbd_make_request).
* so this can be _any_ process.
*/
-void __drbd_set_out_of_sync(drbd_dev *mdev, sector_t sector, int size, const char *file, const unsigned int line)
+void __drbd_set_out_of_sync(struct drbd_conf *mdev, sector_t sector, int size, const char *file, const unsigned int line)
{
unsigned long sbnr, ebnr, lbnr;
sector_t esector, nr_sectors;
@@ -1015,7 +1015,7 @@
}
static inline
-struct bm_extent *_bme_get(struct Drbd_Conf *mdev, unsigned int enr)
+struct bm_extent *_bme_get(struct drbd_conf *mdev, unsigned int enr)
{
struct bm_extent *bm_ext;
int wakeup = 0;
@@ -1051,7 +1051,7 @@
return bm_ext;
}
-static inline int _is_in_al(drbd_dev *mdev, unsigned int enr)
+static inline int _is_in_al(struct drbd_conf *mdev, unsigned int enr)
{
struct lc_element *al_ext;
int rv = 0;
@@ -1084,7 +1084,7 @@
* returns 1 if successful.
* returns 0 if interrupted.
*/
-int drbd_rs_begin_io(drbd_dev *mdev, sector_t sector)
+int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector)
{
unsigned int enr = BM_SECT_TO_EXT(sector);
struct bm_extent *bm_ext;
@@ -1131,7 +1131,7 @@
* returns zero if we could set BME_LOCKED and can proceed,
* -EAGAIN if we need to try again.
*/
-int drbd_try_rs_begin_io(drbd_dev *mdev, sector_t sector)
+int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector)
{
unsigned int enr = BM_SECT_TO_EXT(sector);
const unsigned int al_enr = enr*AL_EXT_PER_BM_SECT;
@@ -1241,7 +1241,7 @@
return -EAGAIN;
}
-void drbd_rs_complete_io(drbd_dev *mdev, sector_t sector)
+void drbd_rs_complete_io(struct drbd_conf *mdev, sector_t sector)
{
unsigned int enr = BM_SECT_TO_EXT(sector);
struct bm_extent *bm_ext;
@@ -1281,7 +1281,7 @@
* drbd_rs_cancel_all: Removes extents from the resync LRU. Even
* if they are BME_LOCKED.
*/
-void drbd_rs_cancel_all(drbd_dev *mdev)
+void drbd_rs_cancel_all(struct drbd_conf *mdev)
{
struct bm_extent *bm_ext;
int i;
@@ -1318,7 +1318,7 @@
* returns -EAGAIN.
* In case all elements got removed it returns zero.
*/
-int drbd_rs_del_all(drbd_dev *mdev)
+int drbd_rs_del_all(struct drbd_conf *mdev)
{
struct bm_extent *bm_ext;
int i;
@@ -1369,7 +1369,7 @@
* called on SyncTarget when resync write fails or NegRSDReply received
*
*/
-void drbd_rs_failed_io(drbd_dev *mdev, sector_t sector, int size)
+void drbd_rs_failed_io(struct drbd_conf *mdev, sector_t sector, int size)
{
/* Is called from worker and receiver context _only_ */
unsigned long sbnr, ebnr, lbnr, bnr;
Modified: branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -108,7 +108,7 @@
#define BM_LOCKED 0
#define BM_MD_IO_ERROR (BITS_PER_LONG-1) /* 31? 63? */
-void __drbd_bm_lock(drbd_dev *mdev, char *file, int line)
+void __drbd_bm_lock(struct drbd_conf *mdev, char *file, int line)
{
struct drbd_bitmap *b = mdev->bitmap;
spin_lock_irq(&b->bm_lock);
@@ -128,7 +128,7 @@
spin_unlock_irq(&b->bm_lock);
}
-void drbd_bm_unlock(drbd_dev *mdev)
+void drbd_bm_unlock(struct drbd_conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
spin_lock_irq(&b->bm_lock);
@@ -145,7 +145,7 @@
#if DUMP_MD >= 3
/* debugging aid */
-STATIC void bm_end_info(drbd_dev *mdev, const char *where)
+void bm_end_info(struct drbd_conf *mdev, const char *where)
{
struct drbd_bitmap *b = mdev->bitmap;
size_t w = (b->bm_bits-1) >> LN2_BPL;
@@ -168,7 +168,7 @@
/*
* actually most functions herein should take a struct drbd_bitmap*, not a
- * drbd_dev*, but for the debug macros I like to have the mdev around
+ * struct drbd_conf*, but for the debug macros I like to have the mdev around
* to be able to report device specific.
*/
@@ -182,7 +182,7 @@
* called on driver init only. TODO call when a device is created.
* allocates the drbd_bitmap, and stores it in mdev->bitmap.
*/
-int drbd_bm_init(drbd_dev *mdev)
+int drbd_bm_init(struct drbd_conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
WARN_ON(b);
@@ -198,7 +198,7 @@
return 0;
}
-sector_t drbd_bm_capacity(drbd_dev *mdev)
+sector_t drbd_bm_capacity(struct drbd_conf *mdev)
{
ERR_IF(!mdev->bitmap) return 0;
return mdev->bitmap->bm_dev_capacity;
@@ -206,7 +206,7 @@
/* called on driver unload. TODO: call when a device is destroyed.
*/
-void drbd_bm_cleanup(drbd_dev *mdev)
+void drbd_bm_cleanup(struct drbd_conf *mdev)
{
ERR_IF (!mdev->bitmap) return;
/* FIXME I think we should explicitly change the device size to zero
@@ -224,7 +224,7 @@
* this masks out the remaining bits.
* Rerturns the number of bits cleared.
*/
-STATIC int bm_clear_surplus(struct drbd_bitmap *b)
+int bm_clear_surplus(struct drbd_bitmap *b)
{
const unsigned long mask = (1UL << (b->bm_bits & (BITS_PER_LONG-1))) -1;
size_t w = b->bm_bits >> LN2_BPL;
@@ -243,7 +243,7 @@
return cleared;
}
-STATIC void bm_set_surplus(struct drbd_bitmap *b)
+void bm_set_surplus(struct drbd_bitmap *b)
{
const unsigned long mask = (1UL << (b->bm_bits & (BITS_PER_LONG-1))) -1;
size_t w = b->bm_bits >> LN2_BPL;
@@ -255,7 +255,7 @@
b->bm[w++] = ~(0UL);
}
-STATIC unsigned long bm_count_bits(struct drbd_bitmap *b, int just_read)
+unsigned long bm_count_bits(struct drbd_bitmap *b, int just_read)
{
unsigned long *bm = b->bm;
unsigned long *ep = b->bm + b->bm_words;
@@ -272,7 +272,7 @@
return bits;
}
-void _drbd_bm_recount_bits(drbd_dev *mdev, char *file, int line)
+void _drbd_bm_recount_bits(struct drbd_conf *mdev, char *file, int line)
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long flags, bits;
@@ -299,7 +299,7 @@
* In case this is actually a resize, we copy the old bitmap into the new one.
* Otherwise, the bitmap is initiallized to all bits set.
*/
-int drbd_bm_resize(drbd_dev *mdev, sector_t capacity)
+int drbd_bm_resize(struct drbd_conf *mdev, sector_t capacity)
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long bits, bytes, words, *nbm, *obm = 0;
@@ -406,7 +406,7 @@
*
* maybe bm_set should be atomic_t ?
*/
-unsigned long drbd_bm_total_weight(drbd_dev *mdev)
+unsigned long drbd_bm_total_weight(struct drbd_conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long s;
@@ -421,7 +421,7 @@
return s;
}
-size_t drbd_bm_words(drbd_dev *mdev)
+size_t drbd_bm_words(struct drbd_conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
ERR_IF(!b) return 0;
@@ -431,7 +431,7 @@
/* merge number words from buffer into the bitmap starting at offset.
* buffer[i] is expected to be little endian unsigned long.
*/
-void drbd_bm_merge_lel( drbd_dev *mdev, size_t offset, size_t number,
+void drbd_bm_merge_lel( struct drbd_conf *mdev, size_t offset, size_t number,
unsigned long *buffer )
{
struct drbd_bitmap *b = mdev->bitmap;
@@ -469,8 +469,8 @@
/* copy number words from buffer into the bitmap starting at offset.
* buffer[i] is expected to be little endian unsigned long.
*/
-void drbd_bm_set_lel( drbd_dev *mdev, size_t offset, size_t number,
- unsigned long *buffer )
+void drbd_bm_set_lel(struct drbd_conf *mdev, size_t offset, size_t number,
+ unsigned long *buffer)
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long *bm;
@@ -507,8 +507,8 @@
/* copy number words from the bitmap starting at offset into the buffer.
* buffer[i] will be little endian unsigned long.
*/
-void drbd_bm_get_lel( drbd_dev *mdev, size_t offset, size_t number,
- unsigned long *buffer )
+void drbd_bm_get_lel(struct drbd_conf *mdev, size_t offset, size_t number,
+ unsigned long *buffer )
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long *bm;
@@ -535,7 +535,7 @@
}
/* set all bits in the bitmap */
-void drbd_bm_set_all(drbd_dev *mdev)
+void drbd_bm_set_all(struct drbd_conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
ERR_IF(!b) return;
@@ -578,7 +578,7 @@
return 0;
}
-STATIC void drbd_bm_page_io_async(drbd_dev *mdev, struct drbd_bitmap *b, int page_nr, int rw)
+void drbd_bm_page_io_async(struct drbd_conf *mdev, struct drbd_bitmap *b, int page_nr, int rw)
{
/* we are process context. we always get a bio */
/* THINK: do we need GFP_NOIO here? */
@@ -613,7 +613,7 @@
* @enr is _sector_ offset from start of on disk bitmap (aka bm-extent nr).
* returns 0 on success, -EIO on failure
*/
-int drbd_bm_read_sect(drbd_dev *mdev, unsigned long enr)
+int drbd_bm_read_sect(struct drbd_conf *mdev, unsigned long enr)
{
sector_t on_disk_sector = mdev->bc->md.md_offset + mdev->bc->md.bm_offset + enr;
int bm_words, num_words, offset, err = 0;
@@ -680,7 +680,7 @@
/* lel_to_cpu == cpu_to_lel */
# define bm_lel_to_cpu(x) bm_cpu_to_lel(x)
-STATIC int drbd_bm_rw(struct Drbd_Conf *mdev, int rw)
+int drbd_bm_rw(struct drbd_conf *mdev, int rw)
{
struct drbd_bitmap *b = mdev->bitmap;
/* sector_t sector; */
@@ -745,7 +745,7 @@
return err;
}
-int drbd_bm_read(struct Drbd_Conf *mdev)
+int drbd_bm_read(struct drbd_conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
int err = 0;
@@ -768,7 +768,7 @@
* @enr: The _sector_ offset from the start of the bitmap.
*
*/
-int drbd_bm_write_sect(struct Drbd_Conf *mdev, unsigned long enr)
+int drbd_bm_write_sect(struct drbd_conf *mdev, unsigned long enr)
{
sector_t on_disk_sector = enr + mdev->bc->md.md_offset + mdev->bc->md.bm_offset;
int bm_words, num_words, offset, err = 0;
@@ -804,7 +804,7 @@
/**
* drbd_bm_write: Write the whole bitmap to its on disk location.
*/
-int drbd_bm_write(struct Drbd_Conf *mdev)
+int drbd_bm_write(struct drbd_conf *mdev)
{
int err = drbd_bm_rw(mdev, WRITE);
@@ -815,7 +815,7 @@
}
/* clear all bits in the bitmap */
-void drbd_bm_clear_all(drbd_dev *mdev)
+void drbd_bm_clear_all(struct drbd_conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
@@ -828,7 +828,7 @@
spin_unlock_irq(&b->bm_lock);
}
-void drbd_bm_reset_find(drbd_dev *mdev)
+void drbd_bm_reset_find(struct drbd_conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
@@ -845,7 +845,7 @@
* should not make much difference anyways, but ...
* this returns a bit number, NOT a sector!
*/
-unsigned long drbd_bm_find_next(drbd_dev *mdev)
+unsigned long drbd_bm_find_next(struct drbd_conf *mdev)
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long i = -1UL;
@@ -869,7 +869,7 @@
return i;
}
-void drbd_bm_set_find(drbd_dev *mdev, unsigned long i)
+void drbd_bm_set_find(struct drbd_conf *mdev, unsigned long i)
{
struct drbd_bitmap *b = mdev->bitmap;
@@ -881,7 +881,7 @@
}
-int drbd_bm_rs_done(drbd_dev *mdev)
+int drbd_bm_rs_done(struct drbd_conf *mdev)
{
return mdev->bitmap->bm_fo == 0;
}
@@ -893,7 +893,7 @@
/* returns previous bit state
* wants bitnr, NOT sector.
*/
-int drbd_bm_set_bit(drbd_dev *mdev, const unsigned long bitnr)
+int drbd_bm_set_bit(struct drbd_conf *mdev, const unsigned long bitnr)
{
struct drbd_bitmap *b = mdev->bitmap;
int i;
@@ -925,7 +925,7 @@
/* returns number of bits actually changed (0->1)
* wants bitnr, not sector */
-int drbd_bm_set_bits_in_irq(drbd_dev *mdev, const unsigned long s, const unsigned long e)
+int drbd_bm_set_bits_in_irq(struct drbd_conf *mdev, const unsigned long s, const unsigned long e)
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long bitnr;
@@ -949,7 +949,7 @@
/* returns previous bit state
* wants bitnr, NOT sector.
*/
-int drbd_bm_clear_bit(drbd_dev *mdev, const unsigned long bitnr)
+int drbd_bm_clear_bit(struct drbd_conf *mdev, const unsigned long bitnr)
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long flags;
@@ -985,7 +985,7 @@
* 0 ... bit not set
* -1 ... first out of bounds access, stop testing for bits!
*/
-int drbd_bm_test_bit(drbd_dev *mdev, const unsigned long bitnr)
+int drbd_bm_test_bit(struct drbd_conf *mdev, const unsigned long bitnr)
{
struct drbd_bitmap *b = mdev->bitmap;
int i;
@@ -1020,7 +1020,7 @@
* reference count of some bitmap extent element from some lru instead...
*
*/
-int drbd_bm_e_weight(drbd_dev *mdev, unsigned long enr)
+int drbd_bm_e_weight(struct drbd_conf *mdev, unsigned long enr)
{
struct drbd_bitmap *b = mdev->bitmap;
int count, s, e;
@@ -1048,7 +1048,7 @@
}
/* set all bits covered by the AL-extent al_enr */
-unsigned long drbd_bm_ALe_set_all(drbd_dev *mdev, unsigned long al_enr)
+unsigned long drbd_bm_ALe_set_all(struct drbd_conf *mdev, unsigned long al_enr)
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long weight;
Modified: branches/drbd-8.0-for-linus/drbd/drbd_int.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_int.h 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_int.h 2007-07-24 14:15:33 UTC (rev 2996)
@@ -94,14 +94,9 @@
#define ID_VACANT 0
#define is_syncer_block_id(id) ((id) == ID_SYNCER)
-struct Drbd_Conf;
-typedef struct Drbd_Conf drbd_dev;
+struct drbd_conf;
-#ifdef DBG_ALL_SYMBOLS
-# define STATIC
-#else
-# define STATIC static
-#endif
+#define STATIC
#ifdef PARANOIA
# define PARANOIA_BUG_ON(x) BUG_ON(x)
@@ -181,7 +176,7 @@
#ifdef DBG_ASSERTS
-extern void drbd_assert_breakpoint(drbd_dev *, char *, char *, int );
+extern void drbd_assert_breakpoint(struct drbd_conf *, char *, char *, int );
# define D_ASSERT(exp) if (!(exp)) \
drbd_assert_breakpoint(mdev, #exp, __FILE__, __LINE__)
#else
@@ -208,9 +203,9 @@
};
#ifdef DRBD_ENABLE_FAULTS
-extern unsigned int _drbd_insert_fault(drbd_dev *mdev, unsigned int type);
+extern unsigned int _drbd_insert_fault(struct drbd_conf *mdev, unsigned int type);
static inline int
-drbd_insert_fault(drbd_dev *mdev, unsigned int type) {
+drbd_insert_fault(struct drbd_conf *mdev, unsigned int type) {
return (fault_rate &&
(enable_faults & (1<<type)) &&
_drbd_insert_fault(mdev, type));
@@ -253,23 +248,23 @@
*************************/
#define SET_MDEV_MAGIC(x) \
- ({ typecheck(struct Drbd_Conf*, x); \
+ ({ typecheck(struct drbd_conf*, x); \
(x)->magic = (long)(x) ^ DRBD_MAGIC; })
#define IS_VALID_MDEV(x) \
- ( typecheck(struct Drbd_Conf*, x) && \
+ ( typecheck(struct drbd_conf*, x) && \
((x) ? (((x)->magic ^ DRBD_MAGIC) == (long)(x)):0))
/* drbd_meta-data.c (still in drbd_main.c) */
/* 4th incarnation of the disk layout. */
#define DRBD_MD_MAGIC (DRBD_MAGIC+4)
-extern struct Drbd_Conf **minor_table;
+extern struct drbd_conf **minor_table;
/***
* on the wire
*********************************************************************/
-typedef enum {
+enum Drbd_Packet_Cmd {
Data,
DataReply, /* Response to DataRequest */
RSDataReply, /* Response to RSDataRequest */
@@ -314,9 +309,9 @@
HandShakeS = 0xfff2, /* First Packet on the Socket */
HandShake = 0xfffe /* FIXED for the next century! */
-} Drbd_Packet_Cmd;
+};
-static inline const char *cmdname(Drbd_Packet_Cmd cmd)
+static inline const char *cmdname(enum Drbd_Packet_Cmd cmd)
{
/* THINK may need to become several global tables
* when we want to support more than
@@ -384,12 +379,12 @@
* NOTE that the payload starts at a long aligned offset,
* regardless of 32 or 64 bit arch!
*/
-typedef struct {
+struct Drbd_Header {
u32 magic;
u16 command;
u16 length; /* bytes of data after this header */
char payload[0];
-} __attribute((packed)) Drbd_Header;
+} __attribute((packed));
/* 8 bytes. packet FIXED for the next century! */
/*
@@ -411,13 +406,13 @@
#define DP_RW_SYNC 2
#define DP_MAY_SET_IN_SYNC 4
-typedef struct {
- Drbd_Header head;
+struct Drbd_Data_Packet {
+ struct Drbd_Header head;
u64 sector; /* 64 bits sector number */
u64 block_id; /* to identify the request in protocol B&C */
u32 seq_num;
u32 dp_flags;
-} __attribute((packed)) Drbd_Data_Packet;
+} __attribute((packed));
/*
* commands which share a struct:
@@ -427,22 +422,22 @@
* Drbd_BlockRequest_Packet:
* DataRequest, RSDataRequest
*/
-typedef struct {
- Drbd_Header head;
+struct Drbd_BlockAck_Packet {
+ struct Drbd_Header head;
u64 sector;
u64 block_id;
u32 blksize;
u32 seq_num;
-} __attribute((packed)) Drbd_BlockAck_Packet;
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
- u64 sector;
- u64 block_id;
- u32 blksize;
- u32 pad; /* to multiple of 8 Byte */
-} __attribute((packed)) Drbd_BlockRequest_Packet;
+struct Drbd_BlockRequest_Packet {
+ struct Drbd_Header head;
+ u64 sector;
+ u64 block_id;
+ u32 blksize;
+ u32 pad; /* to multiple of 8 Byte */
+} __attribute((packed));
/*
* commands with their own struct for additional fields:
@@ -453,82 +448,82 @@
* ReportParams
*/
-typedef struct {
- Drbd_Header head; /* 8 bytes */
- u32 protocol_version;
- u32 feature_flags;
+struct Drbd_HandShake_Packet {
+ struct Drbd_Header head; /* 8 bytes */
+ u32 protocol_version;
+ u32 feature_flags;
/* should be more than enough for future enhancements
* for now, feature_flags and the reserverd array shall be zero.
*/
- u64 reserverd[8];
-} __attribute((packed)) Drbd_HandShake_Packet;
+ u64 reserverd[8];
+} __attribute((packed));
/* 80 bytes, FIXED for the next century */
-typedef struct {
- Drbd_Header head;
- u32 barrier; /* barrier number _handle_ only */
- u32 pad; /* to multiple of 8 Byte */
-} __attribute((packed)) Drbd_Barrier_Packet;
+struct Drbd_Barrier_Packet {
+ struct Drbd_Header head;
+ u32 barrier; /* barrier number _handle_ only */
+ u32 pad; /* to multiple of 8 Byte */
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
- u32 barrier;
- u32 set_size;
-} __attribute((packed)) Drbd_BarrierAck_Packet;
+struct Drbd_BarrierAck_Packet {
+ struct Drbd_Header head;
+ u32 barrier;
+ u32 set_size;
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
- u32 rate;
-} __attribute((packed)) Drbd_SyncParam_Packet;
+struct Drbd_SyncParam_Packet {
+ struct Drbd_Header head;
+ u32 rate;
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
- u32 protocol;
- u32 after_sb_0p;
- u32 after_sb_1p;
- u32 after_sb_2p;
- u32 want_lose;
- u32 two_primaries;
-} __attribute((packed)) Drbd_Protocol_Packet;
+struct Drbd_Protocol_Packet {
+ struct Drbd_Header head;
+ u32 protocol;
+ u32 after_sb_0p;
+ u32 after_sb_1p;
+ u32 after_sb_2p;
+ u32 want_lose;
+ u32 two_primaries;
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
- u64 uuid[EXT_UUID_SIZE];
-} __attribute((packed)) Drbd_GenCnt_Packet;
+struct Drbd_GenCnt_Packet {
+ struct Drbd_Header head;
+ u64 uuid[EXT_UUID_SIZE];
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
+struct Drbd_SyncUUID_Packet {
+ struct Drbd_Header head;
u64 uuid;
-} __attribute((packed)) Drbd_SyncUUID_Packet;
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
+struct Drbd_Sizes_Packet {
+ struct Drbd_Header head;
u64 d_size; /* size of disk */
u64 u_size; /* user requested size */
u64 c_size; /* current exported size */
u32 max_segment_size; /* Maximal size of a BIO */
u32 queue_order_type;
-} __attribute((packed)) Drbd_Sizes_Packet;
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
+struct Drbd_State_Packet {
+ struct Drbd_Header head;
u32 state;
-} __attribute((packed)) Drbd_State_Packet;
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
+struct Drbd_Req_State_Packet {
+ struct Drbd_Header head;
u32 mask;
u32 val;
-} __attribute((packed)) Drbd_Req_State_Packet;
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
+struct Drbd_RqS_Reply_Packet {
+ struct Drbd_Header head;
u32 retcode;
-} __attribute((packed)) Drbd_RqS_Reply_Packet;
+} __attribute((packed));
-typedef struct {
+struct Drbd06_Parameter_P {
u64 size;
u32 state;
u32 blksize;
@@ -536,51 +531,51 @@
u32 version;
u32 gen_cnt[5];
u32 bit_map_gen[5];
-} __attribute((packed)) Drbd06_Parameter_P;
+} __attribute((packed));
-typedef struct {
- Drbd_Header head;
+struct Drbd_Discard_Packet {
+ struct Drbd_Header head;
u64 block_id;
u32 seq_num;
u32 pad;
-} __attribute((packed)) Drbd_Discard_Packet;
+} __attribute((packed));
-typedef union {
- Drbd_Header head;
- Drbd_HandShake_Packet HandShake;
- Drbd_Data_Packet Data;
- Drbd_BlockAck_Packet BlockAck;
- Drbd_Barrier_Packet Barrier;
- Drbd_BarrierAck_Packet BarrierAck;
- Drbd_SyncParam_Packet SyncParam;
- Drbd_Protocol_Packet Protocol;
- Drbd_Sizes_Packet Sizes;
- Drbd_GenCnt_Packet GenCnt;
- Drbd_State_Packet State;
- Drbd_Req_State_Packet ReqState;
- Drbd_RqS_Reply_Packet RqSReply;
- Drbd_BlockRequest_Packet BlockRequest;
-} __attribute((packed)) Drbd_Polymorph_Packet;
+union Drbd_Polymorph_Packet {
+ struct Drbd_Header head;
+ struct Drbd_HandShake_Packet HandShake;
+ struct Drbd_Data_Packet Data;
+ struct Drbd_BlockAck_Packet BlockAck;
+ struct Drbd_Barrier_Packet Barrier;
+ struct Drbd_BarrierAck_Packet BarrierAck;
+ struct Drbd_SyncParam_Packet SyncParam;
+ struct Drbd_Protocol_Packet Protocol;
+ struct Drbd_Sizes_Packet Sizes;
+ struct Drbd_GenCnt_Packet GenCnt;
+ struct Drbd_State_Packet State;
+ struct Drbd_Req_State_Packet ReqState;
+ struct Drbd_RqS_Reply_Packet RqSReply;
+ struct Drbd_BlockRequest_Packet BlockRequest;
+} __attribute((packed));
/**********************************************************************/
-typedef enum {
+enum Drbd_thread_state {
None,
Running,
Exiting,
Restarting
-} Drbd_thread_state;
+};
struct Drbd_thread {
spinlock_t t_lock;
struct task_struct *task;
struct completion startstop;
- Drbd_thread_state t_state;
+ enum Drbd_thread_state t_state;
int (*function) (struct Drbd_thread *);
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
};
-static inline Drbd_thread_state get_t_state(struct Drbd_thread *thi)
+static inline enum Drbd_thread_state get_t_state(struct Drbd_thread *thi)
{
/* THINK testing the t_state seems to be uncritical in all cases
* (but thread_{start,stop}), so we can read it *without* the lock.
@@ -598,7 +593,7 @@
* drbd_request and Tl_epoch_entry are descendants of drbd_work.
*/
struct drbd_work;
-typedef int (*drbd_work_cb)(drbd_dev *, struct drbd_work *, int cancel);
+typedef int (*drbd_work_cb)(struct drbd_conf *, struct drbd_work *, int cancel);
struct drbd_work {
struct list_head list;
drbd_work_cb cb;
@@ -607,7 +602,7 @@
struct drbd_barrier;
struct drbd_request {
struct drbd_work w;
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
struct bio *private_bio;
struct hlist_node colision;
sector_t sector;
@@ -636,7 +631,7 @@
int n_req; /* number of requests attached before this barrier */
};
-typedef struct drbd_request drbd_request_t;
+struct drbd_request;
/* These Tl_epoch_entries may be in one of 6 lists:
active_ee .. data packet being written
@@ -647,7 +642,7 @@
struct Tl_epoch_entry {
struct drbd_work w;
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
struct bio *private_bio;
struct hlist_node colision;
sector_t sector;
@@ -700,7 +695,7 @@
WRITE_BM_AFTER_RESYNC /* A kmalloc() during resync failed */
};
-struct drbd_bitmap; /* opaque for Drbd_Conf */
+struct drbd_bitmap; /* opaque for drbd_conf */
/* TODO sort members for performance
* MAYBE group them further */
@@ -729,8 +724,8 @@
struct socket *socket;
/* this way we get our
* send/receive buffers off the stack */
- Drbd_Polymorph_Packet sbuf;
- Drbd_Polymorph_Packet rbuf;
+ union Drbd_Polymorph_Packet sbuf;
+ union Drbd_Polymorph_Packet rbuf;
};
struct drbd_md {
@@ -768,7 +763,7 @@
struct disk_conf dc; /* The user provided config... */
};
-struct Drbd_Conf {
+struct drbd_conf {
#ifdef PARANOIA
long magic;
#endif
@@ -795,8 +790,8 @@
struct timer_list resync_timer;
struct timer_list md_sync_timer;
- drbd_state_t new_state_tmp; /* Used after attach while negotiating new disk state. */
- drbd_state_t state;
+ union drbd_state_t new_state_tmp; /* Used after attach while negotiating new disk state. */
+ union drbd_state_t state;
wait_queue_head_t misc_wait;
wait_queue_head_t state_wait; /* upon each state change. */
unsigned int send_cnt;
@@ -882,16 +877,16 @@
unsigned long comm_bm_set; /* communicated number of set bits. */
};
-static inline drbd_dev *minor_to_mdev(int minor)
+static inline struct drbd_conf *minor_to_mdev(int minor)
{
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
mdev = minor < minor_count ? minor_table[minor] : NULL;
return mdev;
}
-static inline int mdev_to_minor(drbd_dev *mdev)
+static inline int mdev_to_minor(struct drbd_conf *mdev)
{
return mdev->minor;
}
@@ -904,7 +899,7 @@
* CODE();
* drbd_put_data_sock(mdev);
*/
-static inline int drbd_get_data_sock(drbd_dev *mdev)
+static inline int drbd_get_data_sock(struct drbd_conf *mdev)
{
down(&mdev->data.mutex);
/* drbd_disconnect() could have called drbd_free_sock()
@@ -916,7 +911,7 @@
return 1;
}
-static inline void drbd_put_data_sock(drbd_dev *mdev)
+static inline void drbd_put_data_sock(struct drbd_conf *mdev)
{
up(&mdev->data.mutex);
}
@@ -934,76 +929,76 @@
ScheduleAfter = 4,
};
-extern int drbd_change_state(drbd_dev *mdev, enum chg_state_flags f,
- drbd_state_t mask, drbd_state_t val);
-extern void drbd_force_state(drbd_dev *, drbd_state_t, drbd_state_t);
-extern int _drbd_request_state(drbd_dev *, drbd_state_t, drbd_state_t,
+extern int drbd_change_state(struct drbd_conf *mdev, enum chg_state_flags f,
+ union drbd_state_t mask, union drbd_state_t val);
+extern void drbd_force_state(struct drbd_conf *, union drbd_state_t, union drbd_state_t);
+extern int _drbd_request_state(struct drbd_conf *, union drbd_state_t, union drbd_state_t,
enum chg_state_flags);
-extern int _drbd_set_state(drbd_dev *, drbd_state_t, enum chg_state_flags );
-extern void print_st_err(drbd_dev *, drbd_state_t, drbd_state_t, int );
-extern void after_state_ch(drbd_dev *mdev, drbd_state_t os, drbd_state_t ns,
+extern int _drbd_set_state(struct drbd_conf *, union drbd_state_t, enum chg_state_flags );
+extern void print_st_err(struct drbd_conf *, union drbd_state_t, union drbd_state_t, int );
+extern void after_state_ch(struct drbd_conf *mdev, union drbd_state_t os, union drbd_state_t ns,
enum chg_state_flags);
extern int drbd_thread_start(struct Drbd_thread *thi);
extern void _drbd_thread_stop(struct Drbd_thread *thi, int restart, int wait);
extern void drbd_thread_signal(struct Drbd_thread *thi);
-extern void drbd_free_resources(drbd_dev *mdev);
-extern void tl_release(drbd_dev *mdev, unsigned int barrier_nr,
+extern void drbd_free_resources(struct drbd_conf *mdev);
+extern void tl_release(struct drbd_conf *mdev, unsigned int barrier_nr,
unsigned int set_size);
-extern void tl_clear(drbd_dev *mdev);
-extern struct drbd_barrier *_tl_add_barrier(drbd_dev *, struct drbd_barrier *);
-extern void drbd_free_sock(drbd_dev *mdev);
-extern int drbd_send(drbd_dev *mdev, struct socket *sock,
+extern void tl_clear(struct drbd_conf *mdev);
+extern struct drbd_barrier *_tl_add_barrier(struct drbd_conf *, struct drbd_barrier *);
+extern void drbd_free_sock(struct drbd_conf *mdev);
+extern int drbd_send(struct drbd_conf *mdev, struct socket *sock,
void *buf, size_t size, unsigned msg_flags);
-extern int drbd_send_protocol(drbd_dev *mdev);
-extern int drbd_send_uuids(drbd_dev *mdev);
-extern int drbd_send_sync_uuid(drbd_dev *mdev, u64 val);
-extern int drbd_send_sizes(drbd_dev *mdev);
-extern int drbd_send_state(drbd_dev *mdev);
-extern int _drbd_send_cmd(drbd_dev *mdev, struct socket *sock,
- Drbd_Packet_Cmd cmd, Drbd_Header *h,
+extern int drbd_send_protocol(struct drbd_conf *mdev);
+extern int drbd_send_uuids(struct drbd_conf *mdev);
+extern int drbd_send_sync_uuid(struct drbd_conf *mdev, u64 val);
+extern int drbd_send_sizes(struct drbd_conf *mdev);
+extern int drbd_send_state(struct drbd_conf *mdev);
+extern int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock,
+ enum Drbd_Packet_Cmd cmd, struct Drbd_Header *h,
size_t size, unsigned msg_flags);
#define USE_DATA_SOCKET 1
#define USE_META_SOCKET 0
-extern int drbd_send_cmd(drbd_dev *mdev, int use_data_socket,
- Drbd_Packet_Cmd cmd, Drbd_Header *h, size_t size);
-extern int drbd_send_cmd2(drbd_dev *mdev, Drbd_Packet_Cmd cmd,
+extern int drbd_send_cmd(struct drbd_conf *mdev, int use_data_socket,
+ enum Drbd_Packet_Cmd cmd, struct Drbd_Header *h, size_t size);
+extern int drbd_send_cmd2(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd,
char *data, size_t size);
-extern int drbd_send_sync_param(drbd_dev *mdev, struct syncer_conf *sc);
-extern int drbd_send_b_ack(drbd_dev *mdev, u32 barrier_nr,
+extern int drbd_send_sync_param(struct drbd_conf *mdev, struct syncer_conf *sc);
+extern int drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr,
u32 set_size);
-extern int drbd_send_ack(drbd_dev *mdev, Drbd_Packet_Cmd cmd,
+extern int drbd_send_ack(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd,
struct Tl_epoch_entry *e);
-extern int drbd_send_ack_rp(drbd_dev *mdev, Drbd_Packet_Cmd cmd,
- Drbd_BlockRequest_Packet *rp);
-extern int drbd_send_ack_dp(drbd_dev *mdev, Drbd_Packet_Cmd cmd,
- Drbd_Data_Packet *dp);
-extern int _drbd_send_page(drbd_dev *mdev, struct page *page,
+extern int drbd_send_ack_rp(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd,
+ struct Drbd_BlockRequest_Packet *rp);
+extern int drbd_send_ack_dp(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd,
+ struct Drbd_Data_Packet *dp);
+extern int _drbd_send_page(struct drbd_conf *mdev, struct page *page,
int offset, size_t size);
-extern int drbd_send_block(drbd_dev *mdev, Drbd_Packet_Cmd cmd,
+extern int drbd_send_block(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd,
struct Tl_epoch_entry *e);
-extern int drbd_send_dblock(drbd_dev *mdev, drbd_request_t *req);
-extern int _drbd_send_barrier(drbd_dev *mdev, struct drbd_barrier *barrier);
-extern int drbd_send_drequest(drbd_dev *mdev, int cmd,
+extern int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req);
+extern int _drbd_send_barrier(struct drbd_conf *mdev, struct drbd_barrier *barrier);
+extern int drbd_send_drequest(struct drbd_conf *mdev, int cmd,
sector_t sector, int size, u64 block_id);
-extern int drbd_send_bitmap(drbd_dev *mdev);
-extern int _drbd_send_bitmap(drbd_dev *mdev);
-extern int drbd_send_sr_reply(drbd_dev *mdev, int retcode);
+extern int drbd_send_bitmap(struct drbd_conf *mdev);
+extern int _drbd_send_bitmap(struct drbd_conf *mdev);
+extern int drbd_send_sr_reply(struct drbd_conf *mdev, int retcode);
extern void drbd_free_bc(struct drbd_backing_dev *bc);
-extern int drbd_io_error(drbd_dev *mdev, int forcedetach);
-extern void drbd_mdev_cleanup(drbd_dev *mdev);
+extern int drbd_io_error(struct drbd_conf *mdev, int forcedetach);
+extern void drbd_mdev_cleanup(struct drbd_conf *mdev);
/* drbd_meta-data.c (still in drbd_main.c) */
-extern void drbd_md_sync(drbd_dev *mdev);
-extern int drbd_md_read(drbd_dev *mdev, struct drbd_backing_dev *bdev);
+extern void drbd_md_sync(struct drbd_conf *mdev);
+extern int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev);
/* maybe define them below as inline? */
-extern void drbd_uuid_set(drbd_dev *mdev, int idx, u64 val);
-extern void _drbd_uuid_set(drbd_dev *mdev, int idx, u64 val);
-extern void drbd_uuid_new_current(drbd_dev *mdev);
-extern void drbd_uuid_set_bm(drbd_dev *mdev, u64 val);
-extern void drbd_md_set_flag(drbd_dev *mdev, int flags);
-extern void drbd_md_clear_flag(drbd_dev *mdev, int flags);
+extern void drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val);
+extern void _drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val);
+extern void drbd_uuid_new_current(struct drbd_conf *mdev);
+extern void drbd_uuid_set_bm(struct drbd_conf *mdev, u64 val);
+extern void drbd_md_set_flag(struct drbd_conf *mdev, int flags);
+extern void drbd_md_clear_flag(struct drbd_conf *mdev, int flags);
extern int drbd_md_test_flag(struct drbd_backing_dev *, int);
-extern void drbd_md_mark_dirty(drbd_dev *mdev);
+extern void drbd_md_mark_dirty(struct drbd_conf *mdev);
/* Meta data layout
We reserve a 128MB Block (4k aligned)
@@ -1095,7 +1090,7 @@
* including offset and compression scheme and whatnot
* Do not use PAGE_SIZE here! Use a architecture agnostic constant!
*/
-#define BM_PACKET_WORDS ((4096-sizeof(Drbd_Header))/sizeof(long))
+#define BM_PACKET_WORDS ((4096-sizeof(struct Drbd_Header))/sizeof(long))
/* the extent in "PER_EXTENT" below is an activity log extent
* we need that many (long words/bytes) to store the bitmap
@@ -1135,46 +1130,46 @@
/* Number of elements in the app_reads_hash */
#define APP_R_HSIZE 15
-extern int drbd_bm_init(drbd_dev *mdev);
-extern int drbd_bm_resize(drbd_dev *mdev, sector_t sectors);
-extern void drbd_bm_cleanup(drbd_dev *mdev);
-extern void drbd_bm_set_all(drbd_dev *mdev);
-extern void drbd_bm_clear_all(drbd_dev *mdev);
-extern void drbd_bm_reset_find(drbd_dev *mdev);
-extern int drbd_bm_set_bit(drbd_dev *mdev, unsigned long bitnr);
+extern int drbd_bm_init(struct drbd_conf *mdev);
+extern int drbd_bm_resize(struct drbd_conf *mdev, sector_t sectors);
+extern void drbd_bm_cleanup(struct drbd_conf *mdev);
+extern void drbd_bm_set_all(struct drbd_conf *mdev);
+extern void drbd_bm_clear_all(struct drbd_conf *mdev);
+extern void drbd_bm_reset_find(struct drbd_conf *mdev);
+extern int drbd_bm_set_bit(struct drbd_conf *mdev, unsigned long bitnr);
extern int drbd_bm_set_bits_in_irq(
- drbd_dev *mdev, unsigned long s, unsigned long e);
-extern int drbd_bm_test_bit(drbd_dev *mdev, unsigned long bitnr);
-extern int drbd_bm_clear_bit(drbd_dev *mdev, unsigned long bitnr);
-extern int drbd_bm_e_weight(drbd_dev *mdev, unsigned long enr);
-extern int drbd_bm_read_sect(drbd_dev *mdev, unsigned long enr);
-extern int drbd_bm_write_sect(drbd_dev *mdev, unsigned long enr);
-extern int drbd_bm_read(drbd_dev *mdev);
-extern int drbd_bm_write(drbd_dev *mdev);
-extern unsigned long drbd_bm_ALe_set_all(drbd_dev *mdev, unsigned long al_enr);
-extern size_t drbd_bm_words(drbd_dev *mdev);
-extern sector_t drbd_bm_capacity(drbd_dev *mdev);
-extern unsigned long drbd_bm_find_next(drbd_dev *mdev);
-extern void drbd_bm_set_find(drbd_dev *mdev, unsigned long i);
-extern unsigned long drbd_bm_total_weight(drbd_dev *mdev);
-extern int drbd_bm_rs_done(drbd_dev *mdev);
+ struct drbd_conf *mdev, unsigned long s, unsigned long e);
+extern int drbd_bm_test_bit(struct drbd_conf *mdev, unsigned long bitnr);
+extern int drbd_bm_clear_bit(struct drbd_conf *mdev, unsigned long bitnr);
+extern int drbd_bm_e_weight(struct drbd_conf *mdev, unsigned long enr);
+extern int drbd_bm_read_sect(struct drbd_conf *mdev, unsigned long enr);
+extern int drbd_bm_write_sect(struct drbd_conf *mdev, unsigned long enr);
+extern int drbd_bm_read(struct drbd_conf *mdev);
+extern int drbd_bm_write(struct drbd_conf *mdev);
+extern unsigned long drbd_bm_ALe_set_all(struct drbd_conf *mdev, unsigned long al_enr);
+extern size_t drbd_bm_words(struct drbd_conf *mdev);
+extern sector_t drbd_bm_capacity(struct drbd_conf *mdev);
+extern unsigned long drbd_bm_find_next(struct drbd_conf *mdev);
+extern void drbd_bm_set_find(struct drbd_conf *mdev, unsigned long i);
+extern unsigned long drbd_bm_total_weight(struct drbd_conf *mdev);
+extern int drbd_bm_rs_done(struct drbd_conf *mdev);
/* for receive_bitmap */
-extern void drbd_bm_merge_lel(drbd_dev *mdev, size_t offset, size_t number,
+extern void drbd_bm_merge_lel(struct drbd_conf *mdev, size_t offset, size_t number,
unsigned long *buffer);
/* for _drbd_send_bitmap and drbd_bm_write_sect */
-extern void drbd_bm_get_lel(drbd_dev *mdev, size_t offset, size_t number,
+extern void drbd_bm_get_lel(struct drbd_conf *mdev, size_t offset, size_t number,
unsigned long *buffer);
/*
* only used by drbd_bm_read_sect
-extern void drbd_bm_set_lel(drbd_dev *mdev, size_t offset, size_t number,
+extern void drbd_bm_set_lel(struct drbd_conf *mdev, size_t offset, size_t number,
unsigned long* buffer);
*/
-extern void __drbd_bm_lock(drbd_dev *mdev, char *file, int line);
-extern void drbd_bm_unlock(drbd_dev *mdev);
+extern void __drbd_bm_lock(struct drbd_conf *mdev, char *file, int line);
+extern void drbd_bm_unlock(struct drbd_conf *mdev);
#define drbd_bm_lock(mdev) __drbd_bm_lock(mdev, __FILE__, __LINE__ )
-extern void _drbd_bm_recount_bits(drbd_dev *mdev, char *file, int line);
+extern void _drbd_bm_recount_bits(struct drbd_conf *mdev, char *file, int line);
#define drbd_bm_recount_bits(mdev) _drbd_bm_recount_bits(mdev, __FILE__, __LINE__ )
/* drbd_main.c */
@@ -1193,7 +1188,7 @@
extern int drbd_pp_vacant;
extern wait_queue_head_t drbd_pp_wait;
-extern drbd_dev *drbd_new_device(int minor);
+extern struct drbd_conf *drbd_new_device(int minor);
/* Dynamic tracing framework */
#ifdef ENABLE_DYNAMIC_TRACE
@@ -1226,7 +1221,7 @@
return ((trace_level >= level) && (type & trace_type));
}
static inline int
-is_mdev_trace(drbd_dev *mdev, unsigned int type, unsigned int level) {
+is_mdev_trace(struct drbd_conf *mdev, unsigned int type, unsigned int level) {
return (is_trace(type, level) &&
( ( 1 << mdev_to_minor(mdev)) & trace_devs));
}
@@ -1246,25 +1241,25 @@
} while (0)
/* Buffer printing support
- * DbgPrintFlags: used for Flags arg to DbgPrintBuffer
+ * dbg_print_flags: used for Flags arg to drbd_print_buffer
* - DBGPRINT_BUFFADDR; if set, each line starts with the
* virtual address of the line being output. If clear,
* each line starts with the offset from the beginning
* of the buffer. */
-typedef enum {
+enum dbg_print_flags {
DBGPRINT_BUFFADDR = 0x0001,
-} DbgPrintFlags;
+};
-extern void drbd_print_uuid(drbd_dev *mdev, unsigned int idx);
+extern void drbd_print_uuid(struct drbd_conf *mdev, unsigned int idx);
extern void drbd_print_buffer(const char *prefix, unsigned int flags, int size,
const void *buffer, const void *buffer_va,
unsigned int length);
/* Bio printing support */
-extern void _dump_bio(drbd_dev *mdev, struct bio *bio, int complete);
+extern void _dump_bio(struct drbd_conf *mdev, struct bio *bio, int complete);
-static inline void dump_bio(drbd_dev *mdev, struct bio *bio, int complete)
+static inline void dump_bio(struct drbd_conf *mdev, struct bio *bio, int complete)
{
MTRACE(TraceTypeRq, TraceLvlSummary,
_dump_bio(mdev, bio, complete);
@@ -1272,12 +1267,12 @@
}
/* Packet dumping support */
-extern void _dump_packet(drbd_dev *mdev, struct socket *sock,
- int recv, Drbd_Polymorph_Packet *p, char *file, int line);
+extern void _dump_packet(struct drbd_conf *mdev, struct socket *sock,
+ int recv, union Drbd_Polymorph_Packet *p, char *file, int line);
static inline void
-dump_packet(drbd_dev *mdev, struct socket *sock,
- int recv, Drbd_Polymorph_Packet *p, char *file, int line)
+dump_packet(struct drbd_conf *mdev, struct socket *sock,
+ int recv, union Drbd_Polymorph_Packet *p, char *file, int line)
{
MTRACE(TraceTypePacket, TraceLvlSummary,
_dump_packet(mdev, sock, recv, p, file, line);
@@ -1295,62 +1290,62 @@
/* drbd_req */
extern int drbd_make_request_26(request_queue_t *q, struct bio *bio);
-extern int drbd_read_remote(drbd_dev *mdev, drbd_request_t *req);
+extern int drbd_read_remote(struct drbd_conf *mdev, struct drbd_request *req);
extern int drbd_merge_bvec(request_queue_t *, struct bio *, struct bio_vec *);
-extern int is_valid_ar_handle(drbd_request_t *, sector_t);
+extern int is_valid_ar_handle(struct drbd_request *, sector_t);
/* drbd_nl.c */
extern char *ppsize(char *buf, unsigned long long size);
-extern sector_t drbd_new_dev_size(struct Drbd_Conf *, struct drbd_backing_dev *);
-extern int drbd_determin_dev_size(drbd_dev *);
-extern void drbd_setup_queue_param(drbd_dev *mdev, unsigned int);
-extern int drbd_set_role(drbd_dev *mdev, drbd_role_t new_role, int force);
+extern sector_t drbd_new_dev_size(struct drbd_conf *, struct drbd_backing_dev *);
+extern int drbd_determin_dev_size(struct drbd_conf *);
+extern void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int);
+extern int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force);
extern int drbd_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg);
-drbd_disks_t drbd_try_outdate_peer(drbd_dev *mdev);
+enum drbd_disk_state drbd_try_outdate_peer(struct drbd_conf *mdev);
extern long drbd_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);
-extern int drbd_khelper(drbd_dev *mdev, char *cmd);
+extern int drbd_khelper(struct drbd_conf *mdev, char *cmd);
/* drbd_worker.c */
extern int drbd_worker(struct Drbd_thread *thi);
-extern void drbd_alter_sa(drbd_dev *mdev, int na);
-extern void drbd_start_resync(drbd_dev *mdev, drbd_conns_t side);
-extern void resume_next_sg(drbd_dev *mdev);
-extern void suspend_other_sg(drbd_dev *mdev);
-extern int drbd_resync_finished(drbd_dev *mdev);
+extern void drbd_alter_sa(struct drbd_conf *mdev, int na);
+extern void drbd_start_resync(struct drbd_conf *mdev, enum drbd_conns side);
+extern void resume_next_sg(struct drbd_conf *mdev);
+extern void suspend_other_sg(struct drbd_conf *mdev);
+extern int drbd_resync_finished(struct drbd_conf *mdev);
/* maybe rather drbd_main.c ? */
-extern int drbd_md_sync_page_io(drbd_dev *mdev, struct drbd_backing_dev *bdev,
+extern int drbd_md_sync_page_io(struct drbd_conf *mdev, struct drbd_backing_dev *bdev,
sector_t sector, int rw);
/* worker callbacks */
-extern int w_req_cancel_conflict(drbd_dev *, struct drbd_work *, int);
-extern int w_read_retry_remote(drbd_dev *, struct drbd_work *, int);
-extern int w_e_end_data_req(drbd_dev *, struct drbd_work *, int);
-extern int w_e_end_rsdata_req(drbd_dev *, struct drbd_work *, int);
-extern int w_resync_inactive(drbd_dev *, struct drbd_work *, int);
-extern int w_resume_next_sg(drbd_dev *, struct drbd_work *, int);
-extern int w_io_error(drbd_dev *, struct drbd_work *, int);
-extern int w_send_write_hint(drbd_dev *, struct drbd_work *, int);
-extern int w_make_resync_request(drbd_dev *, struct drbd_work *, int);
-extern int w_send_dblock(drbd_dev *, struct drbd_work *, int);
-extern int w_send_barrier(drbd_dev *, struct drbd_work *, int);
-extern int w_send_read_req(drbd_dev *, struct drbd_work *, int);
-extern int w_prev_work_done(drbd_dev *, struct drbd_work *, int);
+extern int w_req_cancel_conflict(struct drbd_conf *, struct drbd_work *, int);
+extern int w_read_retry_remote(struct drbd_conf *, struct drbd_work *, int);
+extern int w_e_end_data_req(struct drbd_conf *, struct drbd_work *, int);
+extern int w_e_end_rsdata_req(struct drbd_conf *, struct drbd_work *, int);
+extern int w_resync_inactive(struct drbd_conf *, struct drbd_work *, int);
+extern int w_resume_next_sg(struct drbd_conf *, struct drbd_work *, int);
+extern int w_io_error(struct drbd_conf *, struct drbd_work *, int);
+extern int w_send_write_hint(struct drbd_conf *, struct drbd_work *, int);
+extern int w_make_resync_request(struct drbd_conf *, struct drbd_work *, int);
+extern int w_send_dblock(struct drbd_conf *, struct drbd_work *, int);
+extern int w_send_barrier(struct drbd_conf *, struct drbd_work *, int);
+extern int w_send_read_req(struct drbd_conf *, struct drbd_work *, int);
+extern int w_prev_work_done(struct drbd_conf *, struct drbd_work *, int);
extern void resync_timer_fn(unsigned long data);
/* drbd_receiver.c */
-extern int drbd_release_ee(drbd_dev *mdev, struct list_head *list);
-extern struct Tl_epoch_entry *drbd_alloc_ee(drbd_dev *mdev,
+extern int drbd_release_ee(struct drbd_conf *mdev, struct list_head *list);
+extern struct Tl_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev,
u64 id,
sector_t sector,
unsigned int data_size,
unsigned int gfp_mask);
-extern void drbd_free_ee(drbd_dev *mdev, struct Tl_epoch_entry *e);
-extern void drbd_wait_ee_list_empty(drbd_dev *mdev, struct list_head *head);
-extern void _drbd_wait_ee_list_empty(drbd_dev *mdev, struct list_head *head);
-extern void drbd_set_recv_tcq(drbd_dev *mdev, int tcq_enabled);
-extern void _drbd_clear_done_ee(drbd_dev *mdev);
+extern void drbd_free_ee(struct drbd_conf *mdev, struct Tl_epoch_entry *e);
+extern void drbd_wait_ee_list_empty(struct drbd_conf *mdev, struct list_head *head);
+extern void _drbd_wait_ee_list_empty(struct drbd_conf *mdev, struct list_head *head);
+extern void drbd_set_recv_tcq(struct drbd_conf *mdev, int tcq_enabled);
+extern void _drbd_clear_done_ee(struct drbd_conf *mdev);
static inline void drbd_tcp_cork(struct socket *sock)
{
@@ -1384,36 +1379,36 @@
/* drbd_proc.c */
extern struct proc_dir_entry *drbd_proc;
extern struct file_operations drbd_proc_fops;
-extern const char *conns_to_name(drbd_conns_t s);
-extern const char *roles_to_name(drbd_role_t s);
+extern const char *conns_to_name(enum drbd_conns s);
+extern const char *roles_to_name(enum drbd_role s);
/* drbd_actlog.c */
-extern void drbd_al_begin_io(struct Drbd_Conf *mdev, sector_t sector);
-extern void drbd_al_complete_io(struct Drbd_Conf *mdev, sector_t sector);
-extern void drbd_rs_complete_io(struct Drbd_Conf *mdev, sector_t sector);
-extern int drbd_rs_begin_io(struct Drbd_Conf *mdev, sector_t sector);
-extern int drbd_try_rs_begin_io(struct Drbd_Conf *mdev, sector_t sector);
-extern void drbd_rs_cancel_all(drbd_dev *mdev);
-extern int drbd_rs_del_all(drbd_dev *mdev);
-extern void drbd_rs_failed_io(drbd_dev *mdev, sector_t sector, int size);
-extern int drbd_al_read_log(struct Drbd_Conf *mdev, struct drbd_backing_dev *);
-extern void __drbd_set_in_sync(drbd_dev *mdev, sector_t sector, int size, const char *file, const unsigned int line);
+extern void drbd_al_begin_io(struct drbd_conf *mdev, sector_t sector);
+extern void drbd_al_complete_io(struct drbd_conf *mdev, sector_t sector);
+extern void drbd_rs_complete_io(struct drbd_conf *mdev, sector_t sector);
+extern int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector);
+extern int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector);
+extern void drbd_rs_cancel_all(struct drbd_conf *mdev);
+extern int drbd_rs_del_all(struct drbd_conf *mdev);
+extern void drbd_rs_failed_io(struct drbd_conf *mdev, sector_t sector, int size);
+extern int drbd_al_read_log(struct drbd_conf *mdev, struct drbd_backing_dev *);
+extern void __drbd_set_in_sync(struct drbd_conf *mdev, sector_t sector, int size, const char *file, const unsigned int line);
#define drbd_set_in_sync(mdev, sector, size) \
__drbd_set_in_sync(mdev, sector, size, __FILE__, __LINE__ )
-extern void __drbd_set_out_of_sync(drbd_dev *mdev, sector_t sector, int size, const char *file, const unsigned int line);
+extern void __drbd_set_out_of_sync(struct drbd_conf *mdev, sector_t sector, int size, const char *file, const unsigned int line);
#define drbd_set_out_of_sync(mdev, sector, size) \
__drbd_set_out_of_sync(mdev, sector, size, __FILE__, __LINE__ )
-extern void drbd_al_apply_to_bm(struct Drbd_Conf *mdev);
-extern void drbd_al_to_on_disk_bm(struct Drbd_Conf *mdev);
-extern void drbd_al_shrink(struct Drbd_Conf *mdev);
+extern void drbd_al_apply_to_bm(struct drbd_conf *mdev);
+extern void drbd_al_to_on_disk_bm(struct drbd_conf *mdev);
+extern void drbd_al_shrink(struct drbd_conf *mdev);
/* drbd_nl.c */
void drbd_nl_cleanup(void);
int __init drbd_nl_init(void);
-void drbd_bcast_state(drbd_dev *mdev);
-void drbd_bcast_sync_progress(drbd_dev *mdev);
+void drbd_bcast_state(struct drbd_conf *mdev);
+void drbd_bcast_sync_progress(struct drbd_conf *mdev);
/*
* inline helper functions
@@ -1425,41 +1420,42 @@
#define user_isp_mask 1
#define aftr_isp_mask 1
-#define NS(T, S) ({drbd_state_t mask; mask.i = 0; mask.T = T##_mask; mask; }), \
- ({drbd_state_t val; val.i = 0; val.T = (S); val; })
+#define NS(T, S) ({ union drbd_state_t mask; mask.i = 0; mask.T = T##_mask; mask; }), \
+ ({ union drbd_state_t val; val.i = 0; val.T = (S); val; })
#define NS2(T1, S1, T2, S2) \
- ({drbd_state_t mask; mask.i = 0; mask.T1 = T1##_mask; \
+ ({ union drbd_state_t mask; mask.i = 0; mask.T1 = T1##_mask; \
mask.T2 = T2##_mask; mask; }), \
- ({drbd_state_t val; val.i = 0; val.T1 = (S1); \
+ ({ union drbd_state_t val; val.i = 0; val.T1 = (S1); \
val.T2 = (S2); val; })
#define NS3(T1, S1, T2, S2, T3, S3) \
- ({drbd_state_t mask; mask.i = 0; mask.T1 = T1##_mask; \
+ ({ union drbd_state_t mask; mask.i = 0; mask.T1 = T1##_mask; \
mask.T2 = T2##_mask; mask.T3 = T3##_mask; mask; }), \
- ({drbd_state_t val; val.i = 0; val.T1 = (S1); \
+ ({ union drbd_state_t val; val.i = 0; val.T1 = (S1); \
val.T2 = (S2); val.T3 = (S3); val; })
-#define _NS(D, T, S) D, ({drbd_state_t ns; ns.i = D->state.i; ns.T = (S); ns; })
+#define _NS(D, T, S) D, ({ union drbd_state_t ns; ns.i = D->state.i; ns.T = (S); ns; })
#define _NS2(D, T1, S1, T2, S2) \
- D, ({drbd_state_t ns; ns.i = D->state.i; ns.T1 = (S1); \
+ D, ({ union drbd_state_t ns; ns.i = D->state.i; ns.T1 = (S1); \
ns.T2 = (S2); ns; })
#define _NS3(D, T1, S1, T2, S2, T3, S3) \
- D, ({drbd_state_t ns; ns.i = D->state.i; ns.T1 = (S1); \
+ D, ({ union drbd_state_t ns; ns.i = D->state.i; ns.T1 = (S1); \
ns.T2 = (S2); ns.T3 = (S3); ns; })
-static inline void drbd_state_lock(drbd_dev *mdev)
+static inline void drbd_state_lock(struct drbd_conf *mdev)
{
wait_event(mdev->misc_wait,
!test_and_set_bit(CLUSTER_ST_CHANGE, &mdev->flags));
}
-static inline void drbd_state_unlock(drbd_dev *mdev)
+static inline void drbd_state_unlock(struct drbd_conf *mdev)
{
clear_bit(CLUSTER_ST_CHANGE, &mdev->flags);
wake_up(&mdev->misc_wait);
}
-static inline int drbd_request_state(drbd_dev *mdev, drbd_state_t mask,
- drbd_state_t val)
+static inline int drbd_request_state(struct drbd_conf *mdev,
+ union drbd_state_t mask,
+ union drbd_state_t val)
{
return _drbd_request_state(mdev, mask, val, ChgStateVerbose);
}
@@ -1468,7 +1464,7 @@
* drbd_chk_io_error: Handles the on_io_error setting, should be called from
* all io completion handlers. See also drbd_io_error().
*/
-static inline void __drbd_chk_io_error(drbd_dev *mdev, int forcedetach)
+static inline void __drbd_chk_io_error(struct drbd_conf *mdev, int forcedetach)
{
switch (mdev->bc->dc.on_io_error) {
case PassOn: /* FIXME would this be better named "Ignore"? */
@@ -1489,7 +1485,7 @@
}
}
-static inline void drbd_chk_io_error(drbd_dev *mdev, int error, int forcedetach)
+static inline void drbd_chk_io_error(struct drbd_conf *mdev, int error, int forcedetach)
{
if (error) {
unsigned long flags;
@@ -1554,7 +1550,7 @@
}
/* returns the sector number of our meta data 'super' block */
-static inline sector_t drbd_md_ss__(drbd_dev *mdev,
+static inline sector_t drbd_md_ss__(struct drbd_conf *mdev,
struct drbd_backing_dev *bdev)
{
switch (bdev->dc.meta_dev_idx) {
@@ -1608,33 +1604,33 @@
spin_unlock_irqrestore(&q->q_lock, flags);
}
-static inline void wake_asender(drbd_dev *mdev)
+static inline void wake_asender(struct drbd_conf *mdev)
{
if (test_bit(SIGNAL_ASENDER, &mdev->flags))
force_sig(DRBD_SIG, mdev->asender.task);
}
-static inline void request_ping(drbd_dev *mdev)
+static inline void request_ping(struct drbd_conf *mdev)
{
set_bit(SEND_PING, &mdev->flags);
wake_asender(mdev);
}
-static inline int drbd_send_short_cmd(drbd_dev *mdev, Drbd_Packet_Cmd cmd)
+static inline int drbd_send_short_cmd(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd)
{
- Drbd_Header h;
+ struct Drbd_Header h;
return drbd_send_cmd(mdev, USE_DATA_SOCKET, cmd, &h, sizeof(h));
}
-static inline int drbd_send_ping(drbd_dev *mdev)
+static inline int drbd_send_ping(struct drbd_conf *mdev)
{
- Drbd_Header h;
+ struct Drbd_Header h;
return drbd_send_cmd(mdev, USE_META_SOCKET, Ping, &h, sizeof(h));
}
-static inline int drbd_send_ping_ack(drbd_dev *mdev)
+static inline int drbd_send_ping_ack(struct drbd_conf *mdev)
{
- Drbd_Header h;
+ struct Drbd_Header h;
return drbd_send_cmd(mdev, USE_META_SOCKET, PingAck, &h, sizeof(h));
}
@@ -1676,7 +1672,7 @@
* _req_mod(req, connection_lost_while_pending)
* [from tl_clear_barrier]
*/
-static inline void inc_ap_pending(drbd_dev *mdev)
+static inline void inc_ap_pending(struct drbd_conf *mdev)
{
atomic_inc(&mdev->ap_pending_cnt);
}
@@ -1688,7 +1684,7 @@
atomic_read(&mdev->which))
#define dec_ap_pending(mdev) do { \
- typecheck(drbd_dev *, mdev); \
+ typecheck(struct drbd_conf *, mdev); \
if (atomic_dec_and_test(&mdev->ap_pending_cnt)) \
wake_up(&mdev->misc_wait); \
ERR_IF_CNT_IS_NEGATIVE(ap_pending_cnt); } while (0)
@@ -1699,13 +1695,13 @@
* SyncSource sends RSDataReply (and expects WriteAck whith ID_SYNCER)
* (or NegAck with ID_SYNCER)
*/
-static inline void inc_rs_pending(drbd_dev *mdev)
+static inline void inc_rs_pending(struct drbd_conf *mdev)
{
atomic_inc(&mdev->rs_pending_cnt);
}
#define dec_rs_pending(mdev) do { \
- typecheck(drbd_dev *, mdev); \
+ typecheck(struct drbd_conf *, mdev); \
atomic_dec(&mdev->rs_pending_cnt); \
ERR_IF_CNT_IS_NEGATIVE(rs_pending_cnt); } while (0)
@@ -1718,23 +1714,23 @@
* receive_DataRequest (receive_RSDataRequest) we need to send back Data
* receive_Barrier_* we need to send a BarrierAck
*/
-static inline void inc_unacked(drbd_dev *mdev)
+static inline void inc_unacked(struct drbd_conf *mdev)
{
atomic_inc(&mdev->unacked_cnt);
}
#define dec_unacked(mdev) do { \
- typecheck(drbd_dev *, mdev); \
+ typecheck(struct drbd_conf *, mdev); \
atomic_dec(&mdev->unacked_cnt); \
ERR_IF_CNT_IS_NEGATIVE(unacked_cnt); } while (0)
#define sub_unacked(mdev, n) do { \
- typecheck(drbd_dev *, mdev); \
+ typecheck(struct drbd_conf *, mdev); \
atomic_sub(n, &mdev->unacked_cnt); \
ERR_IF_CNT_IS_NEGATIVE(unacked_cnt); } while (0)
-static inline void dec_net(drbd_dev *mdev)
+static inline void dec_net(struct drbd_conf *mdev)
{
if (atomic_dec_and_test(&mdev->net_cnt))
wake_up(&mdev->misc_wait);
@@ -1744,7 +1740,7 @@
* inc_net: Returns TRUE when it is ok to access mdev->net_conf. You
* should call dec_net() when finished looking at mdev->net_conf.
*/
-static inline int inc_net(drbd_dev *mdev)
+static inline int inc_net(struct drbd_conf *mdev)
{
int have_net_conf;
@@ -1760,7 +1756,7 @@
* this is mood...
*/
-static inline void dec_local(drbd_dev *mdev)
+static inline void dec_local(struct drbd_conf *mdev)
{
if (atomic_dec_and_test(&mdev->local_cnt))
wake_up(&mdev->misc_wait);
@@ -1770,7 +1766,7 @@
* inc_local: Returns TRUE when local IO is possible. If it returns
* TRUE you should call dec_local() after IO is completed.
*/
-static inline int inc_local_if_state(drbd_dev *mdev, drbd_disks_t mins)
+static inline int inc_local_if_state(struct drbd_conf *mdev, enum drbd_disk_state mins)
{
int io_allowed;
@@ -1780,7 +1776,7 @@
dec_local(mdev);
return io_allowed;
}
-static inline int inc_local(drbd_dev *mdev)
+static inline int inc_local(struct drbd_conf *mdev)
{
return inc_local_if_state(mdev, Inconsistent);
}
@@ -1788,7 +1784,7 @@
/* this throttles on-the-fly application requests
* according to max_buffers settings;
* maybe re-implement using semaphores? */
-static inline int drbd_get_max_buffers(drbd_dev *mdev)
+static inline int drbd_get_max_buffers(struct drbd_conf *mdev)
{
int mxb = 1000000; /* arbitrary limit on open requests */
if (inc_net(mdev)) {
@@ -1798,7 +1794,7 @@
return mxb;
}
-static inline int __inc_ap_bio_cond(drbd_dev *mdev)
+static inline int __inc_ap_bio_cond(struct drbd_conf *mdev)
{
int mxb = drbd_get_max_buffers(mdev);
if (mdev->state.susp) return 0;
@@ -1814,7 +1810,7 @@
/* I'd like to use wait_event_lock_irq,
* but I'm not sure when it got introduced,
* and not sure when it has 3 or 4 arguments */
-static inline void inc_ap_bio(drbd_dev *mdev)
+static inline void inc_ap_bio(struct drbd_conf *mdev)
{
/* compare with after_state_ch,
* os.conn != WFBitMapS && ns.conn == WFBitMapS */
@@ -1839,7 +1835,7 @@
spin_unlock_irq(&mdev->req_lock);
}
-static inline void dec_ap_bio(drbd_dev *mdev)
+static inline void dec_ap_bio(struct drbd_conf *mdev)
{
int mxb = drbd_get_max_buffers(mdev);
int ap_bio = atomic_dec_return(&mdev->ap_bio_cnt);
@@ -1864,7 +1860,7 @@
/* CAUTION: please no side effects in arguments! */
#define seq_max(a, b) ((u32)(seq_gt((a), (b)) ? (a) : (b)))
-static inline void update_peer_seq(drbd_dev *mdev, unsigned int new_seq)
+static inline void update_peer_seq(struct drbd_conf *mdev, unsigned int new_seq)
{
unsigned int m;
spin_lock(&mdev->peer_seq_lock);
@@ -1874,7 +1870,7 @@
if (m == new_seq) wake_up(&mdev->seq_wait);
}
-static inline int drbd_queue_order_type(drbd_dev *mdev)
+static inline int drbd_queue_order_type(struct drbd_conf *mdev)
{
/* sorry, we currently have no working implementation
* of distributed TCQ stuff */
@@ -1904,7 +1900,7 @@
q->unplug_fn(q);
}
-static inline void drbd_kick_lo(drbd_dev *mdev)
+static inline void drbd_kick_lo(struct drbd_conf *mdev)
{
if (!mdev->bc->backing_bdev) {
if (DRBD_ratelimit(5*HZ, 5)) {
Modified: branches/drbd-8.0-for-linus/drbd/drbd_main.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_main.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_main.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -58,8 +58,8 @@
struct after_state_chg_work {
struct drbd_work w;
- drbd_state_t os;
- drbd_state_t ns;
+ union drbd_state_t os;
+ union drbd_state_t ns;
enum chg_state_flags flags;
};
@@ -68,11 +68,11 @@
int drbd_asender(struct Drbd_thread *);
int drbd_init(void);
-STATIC int drbd_open(struct inode *inode, struct file *file);
-STATIC int drbd_close(struct inode *inode, struct file *file);
-STATIC int w_after_state_ch(drbd_dev *mdev, struct drbd_work *w, int unused);
-STATIC int w_md_sync(drbd_dev *mdev, struct drbd_work *w, int unused);
-STATIC void md_sync_timer_fn(unsigned long data);
+int drbd_open(struct inode *inode, struct file *file);
+int drbd_close(struct inode *inode, struct file *file);
+int w_after_state_ch(struct drbd_conf *mdev, struct drbd_work *w, int unused);
+int w_md_sync(struct drbd_conf *mdev, struct drbd_work *w, int unused);
+void md_sync_timer_fn(unsigned long data);
MODULE_AUTHOR("Philipp Reisner <phil at linbit.com>, Lars Ellenberg <lars at linbit.com>");
MODULE_DESCRIPTION("drbd - Distributed Replicated Block Device v" REL_VERSION);
@@ -125,7 +125,7 @@
/* in 2.6.x, our device mapping and config info contains our virtual gendisks
* as member "struct gendisk *vdisk;"
*/
-struct Drbd_Conf **minor_table;
+struct drbd_conf **minor_table;
struct kmem_cache *drbd_request_cache;
struct kmem_cache *drbd_ee_cache;
@@ -143,7 +143,7 @@
int drbd_pp_vacant;
wait_queue_head_t drbd_pp_wait;
-STATIC struct block_device_operations drbd_ops = {
+struct block_device_operations drbd_ops = {
.owner = THIS_MODULE,
.open = drbd_open,
.release = drbd_close,
@@ -152,7 +152,7 @@
#define ARRY_SIZE(A) (sizeof(A)/sizeof(A[0]))
/************************* The transfer log start */
-STATIC int tl_init(drbd_dev *mdev)
+int tl_init(struct drbd_conf *mdev)
{
struct drbd_barrier *b;
@@ -173,7 +173,7 @@
return 1;
}
-STATIC void tl_cleanup(drbd_dev *mdev)
+void tl_cleanup(struct drbd_conf *mdev)
{
D_ASSERT(mdev->oldest_barrier == mdev->newest_barrier);
kfree(mdev->oldest_barrier);
@@ -188,7 +188,7 @@
* It returns the previously newest barrier
* (not the just created barrier) to the caller.
*/
-struct drbd_barrier *_tl_add_barrier(drbd_dev *mdev, struct drbd_barrier *new)
+struct drbd_barrier *_tl_add_barrier(struct drbd_conf *mdev, struct drbd_barrier *new)
{
struct drbd_barrier *newest_before;
@@ -208,7 +208,7 @@
}
/* when we receive a barrier ack */
-void tl_release(drbd_dev *mdev, unsigned int barrier_nr,
+void tl_release(struct drbd_conf *mdev, unsigned int barrier_nr,
unsigned int set_size)
{
struct drbd_barrier *b;
@@ -255,7 +255,7 @@
/* called by drbd_disconnect (exiting receiver thread)
* or from some after_state_ch */
-void tl_clear(drbd_dev *mdev)
+void tl_clear(struct drbd_conf *mdev)
{
struct drbd_barrier *b, *tmp;
@@ -310,7 +310,7 @@
* anyways. This is to make sure that you get a resynchronisation of
* the full device the next time you connect.
*/
-int drbd_io_error(drbd_dev *mdev, int forcedetach)
+int drbd_io_error(struct drbd_conf *mdev, int forcedetach)
{
enum io_error_handler eh;
unsigned long flags;
@@ -360,7 +360,7 @@
* Returns TRUE if this state change should be preformed as a cluster wide
* transaction. Of course it returns 0 as soon as the connection is lost.
*/
-STATIC int cl_wide_st_chg(drbd_dev *mdev, drbd_state_t os, drbd_state_t ns)
+int cl_wide_st_chg(struct drbd_conf *mdev, union drbd_state_t os, union drbd_state_t ns)
{
return ( os.conn >= Connected && ns.conn >= Connected &&
( ( os.role != Primary && ns.role == Primary ) ||
@@ -370,11 +370,11 @@
(os.conn >= Connected && ns.conn == Disconnecting);
}
-int drbd_change_state(drbd_dev *mdev, enum chg_state_flags f,
- drbd_state_t mask, drbd_state_t val)
+int drbd_change_state(struct drbd_conf *mdev, enum chg_state_flags f,
+ union drbd_state_t mask, union drbd_state_t val)
{
unsigned long flags;
- drbd_state_t os, ns;
+ union drbd_state_t os, ns;
int rv;
spin_lock_irqsave(&mdev->req_lock, flags);
@@ -388,18 +388,18 @@
return rv;
}
-void drbd_force_state(drbd_dev *mdev, drbd_state_t mask, drbd_state_t val)
+void drbd_force_state(struct drbd_conf *mdev, union drbd_state_t mask, union drbd_state_t val)
{
drbd_change_state(mdev, ChgStateHard, mask, val);
}
-STATIC int is_valid_state(drbd_dev *mdev, drbd_state_t ns);
-STATIC int is_valid_state_transition(drbd_dev *, drbd_state_t, drbd_state_t);
-STATIC int drbd_send_state_req(drbd_dev *, drbd_state_t, drbd_state_t);
+int is_valid_state(struct drbd_conf *mdev, union drbd_state_t ns);
+int is_valid_state_transition(struct drbd_conf *, union drbd_state_t, union drbd_state_t);
+int drbd_send_state_req(struct drbd_conf *, union drbd_state_t, union drbd_state_t);
-set_st_err_t _req_st_cond(drbd_dev *mdev, drbd_state_t mask, drbd_state_t val)
+enum set_st_err _req_st_cond(struct drbd_conf *mdev, union drbd_state_t mask, union drbd_state_t val)
{
- drbd_state_t os, ns;
+ union drbd_state_t os, ns;
unsigned long flags;
int rv;
@@ -432,11 +432,11 @@
* transition this function even does a cluster wide transaction.
* It has a cousin named drbd_request_state(), which is always verbose.
*/
-int _drbd_request_state(drbd_dev *mdev, drbd_state_t mask, drbd_state_t val,
+int _drbd_request_state(struct drbd_conf *mdev, union drbd_state_t mask, union drbd_state_t val,
enum chg_state_flags f)
{
unsigned long flags;
- drbd_state_t os, ns;
+ union drbd_state_t os, ns;
int rv;
spin_lock_irqsave(&mdev->req_lock, flags);
@@ -486,7 +486,7 @@
}
-STATIC void print_st(drbd_dev *mdev, char *name, drbd_state_t ns)
+void print_st(struct drbd_conf *mdev, char *name, union drbd_state_t ns)
{
ERR(" %s = { cs:%s st:%s/%s ds:%s/%s %c%c%c%c }\n",
name,
@@ -502,7 +502,7 @@
);
}
-void print_st_err(drbd_dev *mdev, drbd_state_t os, drbd_state_t ns, int err)
+void print_st_err(struct drbd_conf *mdev, union drbd_state_t os, union drbd_state_t ns, int err)
{
ERR("State change failed: %s\n", set_st_err_name(err));
print_st(mdev, " state", os);
@@ -525,7 +525,7 @@
A##s_to_name(ns.A)); \
} })
-STATIC int is_valid_state(drbd_dev *mdev, drbd_state_t ns)
+int is_valid_state(struct drbd_conf *mdev, union drbd_state_t ns)
{
/* See drbd_state_sw_errors in drbd_strings.c */
@@ -576,7 +576,7 @@
return rv;
}
-STATIC int is_valid_state_transition(drbd_dev *mdev, drbd_state_t ns, drbd_state_t os)
+int is_valid_state_transition(struct drbd_conf *mdev, union drbd_state_t ns, union drbd_state_t os)
{
int rv = SS_Success;
@@ -592,9 +592,9 @@
return rv;
}
-int _drbd_set_state(drbd_dev *mdev, drbd_state_t ns, enum chg_state_flags flags)
+int _drbd_set_state(struct drbd_conf *mdev, union drbd_state_t ns, enum chg_state_flags flags)
{
- drbd_state_t os;
+ union drbd_state_t os;
int rv = SS_Success, warn_sync_abort = 0;
enum fencing_policy fp;
@@ -809,7 +809,7 @@
return rv;
}
-STATIC int w_after_state_ch(drbd_dev *mdev, struct drbd_work *w, int unused)
+int w_after_state_ch(struct drbd_conf *mdev, struct drbd_work *w, int unused)
{
struct after_state_chg_work *ascw;
@@ -820,7 +820,7 @@
return 1;
}
-void after_state_ch(drbd_dev *mdev, drbd_state_t os, drbd_state_t ns,
+void after_state_ch(struct drbd_conf *mdev, union drbd_state_t os, union drbd_state_t ns,
enum chg_state_flags flags)
{
enum fencing_policy fp;
@@ -1039,10 +1039,10 @@
}
-STATIC int drbd_thread_setup(void *arg)
+int drbd_thread_setup(void *arg)
{
struct Drbd_thread *thi = (struct Drbd_thread *) arg;
- drbd_dev *mdev = thi->mdev;
+ struct drbd_conf *mdev = thi->mdev;
int retval;
daemonize("drbd_thread");
@@ -1072,7 +1072,7 @@
return retval;
}
-STATIC void drbd_thread_init(drbd_dev *mdev, struct Drbd_thread *thi,
+void drbd_thread_init(struct drbd_conf *mdev, struct Drbd_thread *thi,
int (*func) (struct Drbd_thread *))
{
spin_lock_init(&thi->t_lock);
@@ -1085,7 +1085,7 @@
int drbd_thread_start(struct Drbd_thread *thi)
{
int pid;
- drbd_dev *mdev = thi->mdev;
+ struct drbd_conf *mdev = thi->mdev;
spin_lock(&thi->t_lock);
@@ -1122,8 +1122,8 @@
void _drbd_thread_stop(struct Drbd_thread *thi, int restart, int wait)
{
- drbd_dev *mdev = thi->mdev;
- Drbd_thread_state ns = restart ? Restarting : Exiting;
+ struct drbd_conf *mdev = thi->mdev;
+ enum Drbd_thread_state ns = restart ? Restarting : Exiting;
spin_lock(&thi->t_lock);
@@ -1179,8 +1179,8 @@
}
/* the appropriate socket mutex must be held already */
-int _drbd_send_cmd(drbd_dev *mdev, struct socket *sock,
- Drbd_Packet_Cmd cmd, Drbd_Header *h,
+int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock,
+ enum Drbd_Packet_Cmd cmd, struct Drbd_Header *h,
size_t size, unsigned msg_flags)
{
int sent, ok;
@@ -1190,7 +1190,7 @@
h->magic = BE_DRBD_MAGIC;
h->command = cpu_to_be16(cmd);
- h->length = cpu_to_be16(size-sizeof(Drbd_Header));
+ h->length = cpu_to_be16(size-sizeof(struct Drbd_Header));
dump_packet(mdev, sock, 0, (void *)h, __FILE__, __LINE__);
sent = drbd_send(mdev, sock, h, size, msg_flags);
@@ -1205,8 +1205,8 @@
/* don't pass the socket. we may only look at it
* when we hold the appropriate socket mutex.
*/
-int drbd_send_cmd(drbd_dev *mdev, int use_data_socket,
- Drbd_Packet_Cmd cmd, Drbd_Header *h, size_t size)
+int drbd_send_cmd(struct drbd_conf *mdev, int use_data_socket,
+ enum Drbd_Packet_Cmd cmd, struct Drbd_Header *h, size_t size)
{
int ok = 0;
struct socket *sock;
@@ -1231,10 +1231,10 @@
return ok;
}
-int drbd_send_cmd2(drbd_dev *mdev, Drbd_Packet_Cmd cmd, char *data,
+int drbd_send_cmd2(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd, char *data,
size_t size)
{
- Drbd_Header h;
+ struct Drbd_Header h;
int ok;
h.magic = BE_DRBD_MAGIC;
@@ -1254,18 +1254,18 @@
return ok;
}
-int drbd_send_sync_param(drbd_dev *mdev, struct syncer_conf *sc)
+int drbd_send_sync_param(struct drbd_conf *mdev, struct syncer_conf *sc)
{
- Drbd_SyncParam_Packet p;
+ struct Drbd_SyncParam_Packet p;
p.rate = cpu_to_be32(sc->rate);
- return drbd_send_cmd(mdev, USE_DATA_SOCKET, SyncParam, (Drbd_Header *)&p, sizeof(p));
+ return drbd_send_cmd(mdev, USE_DATA_SOCKET, SyncParam, (struct Drbd_Header *)&p, sizeof(p));
}
-int drbd_send_protocol(drbd_dev *mdev)
+int drbd_send_protocol(struct drbd_conf *mdev)
{
- Drbd_Protocol_Packet p;
+ struct Drbd_Protocol_Packet p;
p.protocol = cpu_to_be32(mdev->net_conf->wire_protocol);
p.after_sb_0p = cpu_to_be32(mdev->net_conf->after_sb_0p);
@@ -1275,12 +1275,12 @@
p.two_primaries = cpu_to_be32(mdev->net_conf->two_primaries);
return drbd_send_cmd(mdev, USE_DATA_SOCKET, ReportProtocol,
- (Drbd_Header *)&p, sizeof(p));
+ (struct Drbd_Header *)&p, sizeof(p));
}
-int drbd_send_uuids(drbd_dev *mdev)
+int drbd_send_uuids(struct drbd_conf *mdev)
{
- Drbd_GenCnt_Packet p;
+ struct Drbd_GenCnt_Packet p;
int i;
u64 uuid_flags = 0;
@@ -1299,22 +1299,22 @@
dec_local(mdev);
return drbd_send_cmd(mdev, USE_DATA_SOCKET, ReportUUIDs,
- (Drbd_Header *)&p, sizeof(p));
+ (struct Drbd_Header *)&p, sizeof(p));
}
-int drbd_send_sync_uuid(drbd_dev *mdev, u64 val)
+int drbd_send_sync_uuid(struct drbd_conf *mdev, u64 val)
{
- Drbd_SyncUUID_Packet p;
+ struct Drbd_SyncUUID_Packet p;
p.uuid = cpu_to_be64(val);
return drbd_send_cmd(mdev, USE_DATA_SOCKET, ReportSyncUUID,
- (Drbd_Header *)&p, sizeof(p));
+ (struct Drbd_Header *)&p, sizeof(p));
}
-int drbd_send_sizes(drbd_dev *mdev)
+int drbd_send_sizes(struct drbd_conf *mdev)
{
- Drbd_Sizes_Packet p;
+ struct Drbd_Sizes_Packet p;
sector_t d_size, u_size;
int q_order_type;
int ok;
@@ -1339,50 +1339,50 @@
p.queue_order_type = cpu_to_be32(q_order_type);
ok = drbd_send_cmd(mdev, USE_DATA_SOCKET, ReportSizes,
- (Drbd_Header *)&p, sizeof(p));
+ (struct Drbd_Header *)&p, sizeof(p));
return ok;
}
-int drbd_send_state(drbd_dev *mdev)
+int drbd_send_state(struct drbd_conf *mdev)
{
- Drbd_State_Packet p;
+ struct Drbd_State_Packet p;
p.state = cpu_to_be32(mdev->state.i);
return drbd_send_cmd(mdev, USE_DATA_SOCKET, ReportState,
- (Drbd_Header *)&p, sizeof(p));
+ (struct Drbd_Header *)&p, sizeof(p));
}
-STATIC int drbd_send_state_req(drbd_dev *mdev, drbd_state_t mask, drbd_state_t val)
+int drbd_send_state_req(struct drbd_conf *mdev, union drbd_state_t mask, union drbd_state_t val)
{
- Drbd_Req_State_Packet p;
+ struct Drbd_Req_State_Packet p;
p.mask = cpu_to_be32(mask.i);
p.val = cpu_to_be32(val.i);
return drbd_send_cmd(mdev, USE_DATA_SOCKET, StateChgRequest,
- (Drbd_Header *)&p, sizeof(p));
+ (struct Drbd_Header *)&p, sizeof(p));
}
-int drbd_send_sr_reply(drbd_dev *mdev, int retcode)
+int drbd_send_sr_reply(struct drbd_conf *mdev, int retcode)
{
- Drbd_RqS_Reply_Packet p;
+ struct Drbd_RqS_Reply_Packet p;
p.retcode = cpu_to_be32(retcode);
return drbd_send_cmd(mdev, USE_META_SOCKET, StateChgReply,
- (Drbd_Header *)&p, sizeof(p));
+ (struct Drbd_Header *)&p, sizeof(p));
}
/* See the comment at receive_bitmap() */
-int _drbd_send_bitmap(drbd_dev *mdev)
+int _drbd_send_bitmap(struct drbd_conf *mdev)
{
int want;
int ok = TRUE, bm_i = 0;
size_t bm_words, num_words;
unsigned long *buffer;
- Drbd_Header *p;
+ struct Drbd_Header *p;
ERR_IF(!mdev->bitmap) return FALSE;
@@ -1422,7 +1422,7 @@
return ok;
}
-int drbd_send_bitmap(drbd_dev *mdev)
+int drbd_send_bitmap(struct drbd_conf *mdev)
{
int ok;
@@ -1433,15 +1433,15 @@
return ok;
}
-int drbd_send_b_ack(drbd_dev *mdev, u32 barrier_nr, u32 set_size)
+int drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr, u32 set_size)
{
int ok;
- Drbd_BarrierAck_Packet p;
+ struct Drbd_BarrierAck_Packet p;
p.barrier = barrier_nr;
p.set_size = cpu_to_be32(set_size);
- ok = drbd_send_cmd(mdev, USE_META_SOCKET, BarrierAck, (Drbd_Header *)&p, sizeof(p));
+ ok = drbd_send_cmd(mdev, USE_META_SOCKET, BarrierAck, (struct Drbd_Header *)&p, sizeof(p));
return ok;
}
@@ -1450,13 +1450,13 @@
* This helper function expects the sector and block_id parameter already
* in big endian!
*/
-STATIC int _drbd_send_ack(drbd_dev *mdev, Drbd_Packet_Cmd cmd,
+int _drbd_send_ack(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd,
u64 sector,
u32 blksize,
u64 block_id)
{
int ok;
- Drbd_BlockAck_Packet p;
+ struct Drbd_BlockAck_Packet p;
p.sector = sector;
p.block_id = block_id;
@@ -1464,27 +1464,27 @@
p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
if (!mdev->meta.socket || mdev->state.conn < Connected) return FALSE;
- ok = drbd_send_cmd(mdev, USE_META_SOCKET, cmd, (Drbd_Header *)&p, sizeof(p));
+ ok = drbd_send_cmd(mdev, USE_META_SOCKET, cmd, (struct Drbd_Header *)&p, sizeof(p));
return ok;
}
-int drbd_send_ack_dp(drbd_dev *mdev, Drbd_Packet_Cmd cmd,
- Drbd_Data_Packet *dp)
+int drbd_send_ack_dp(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd,
+ struct Drbd_Data_Packet *dp)
{
- const int header_size = sizeof(Drbd_Data_Packet) - sizeof(Drbd_Header);
- int data_size = ((Drbd_Header *)dp)->length - header_size;
+ const int header_size = sizeof(struct Drbd_Data_Packet) - sizeof(struct Drbd_Header);
+ int data_size = ((struct Drbd_Header *)dp)->length - header_size;
return _drbd_send_ack(mdev, cmd, dp->sector, cpu_to_be32(data_size),
dp->block_id);
}
-int drbd_send_ack_rp(drbd_dev *mdev, Drbd_Packet_Cmd cmd,
- Drbd_BlockRequest_Packet *rp)
+int drbd_send_ack_rp(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd,
+ struct Drbd_BlockRequest_Packet *rp)
{
return _drbd_send_ack(mdev, cmd, rp->sector, rp->blksize, rp->block_id);
}
-int drbd_send_ack(drbd_dev *mdev, Drbd_Packet_Cmd cmd, struct Tl_epoch_entry *e)
+int drbd_send_ack(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd, struct Tl_epoch_entry *e)
{
return _drbd_send_ack(mdev, cmd,
cpu_to_be64(e->sector),
@@ -1492,11 +1492,11 @@
e->block_id);
}
-int drbd_send_drequest(drbd_dev *mdev, int cmd,
+int drbd_send_drequest(struct drbd_conf *mdev, int cmd,
sector_t sector, int size, u64 block_id)
{
int ok;
- Drbd_BlockRequest_Packet p;
+ struct Drbd_BlockRequest_Packet p;
p.sector = cpu_to_be64(sector);
p.block_id = block_id;
@@ -1504,7 +1504,7 @@
/* FIXME BIO_RW_SYNC ? */
- ok = drbd_send_cmd(mdev, USE_DATA_SOCKET, cmd, (Drbd_Header *)&p, sizeof(p));
+ ok = drbd_send_cmd(mdev, USE_DATA_SOCKET, cmd, (struct Drbd_Header *)&p, sizeof(p));
return ok;
}
@@ -1512,7 +1512,7 @@
* returns FALSE if we should retry,
* TRUE if we think connection is dead
*/
-STATIC int we_should_drop_the_connection(drbd_dev *mdev, struct socket *sock)
+int we_should_drop_the_connection(struct drbd_conf *mdev, struct socket *sock)
{
int drop_it;
/* long elapsed = (long)(jiffies - mdev->last_received); */
@@ -1556,7 +1556,7 @@
XFS seems to have problems, still, it submits pages with page_count == 0!
As a workaround, we disable sendpage on pages with page_count == 0 or PageSlab.
*/
-int _drbd_no_send_page(drbd_dev *mdev, struct page *page,
+int _drbd_no_send_page(struct drbd_conf *mdev, struct page *page,
int offset, size_t size)
{
int ret;
@@ -1565,7 +1565,7 @@
return ret;
}
-int _drbd_send_page(drbd_dev *mdev, struct page *page,
+int _drbd_send_page(struct drbd_conf *mdev, struct page *page,
int offset, size_t size)
{
mm_segment_t oldfs = get_fs();
@@ -1637,7 +1637,7 @@
return ok;
}
-STATIC int _drbd_send_zc_bio(drbd_dev *mdev, struct bio *bio)
+int _drbd_send_zc_bio(struct drbd_conf *mdev, struct bio *bio)
{
struct bio_vec *bvec;
int i;
@@ -1653,10 +1653,10 @@
/* Used to send write requests
* Primary -> Peer (Data)
*/
-int drbd_send_dblock(drbd_dev *mdev, drbd_request_t *req)
+int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
{
int ok = 1;
- Drbd_Data_Packet p;
+ struct Drbd_Data_Packet p;
unsigned int dp_flags = 0;
if (!drbd_get_data_sock(mdev))
@@ -1664,7 +1664,7 @@
p.head.magic = BE_DRBD_MAGIC;
p.head.command = cpu_to_be16(Data);
- p.head.length = cpu_to_be16(sizeof(p)-sizeof(Drbd_Header)+req->size);
+ p.head.length = cpu_to_be16(sizeof(p)-sizeof(struct Drbd_Header)+req->size);
p.sector = cpu_to_be64(req->sector);
p.block_id = (unsigned long)req;
@@ -1698,15 +1698,15 @@
* Peer -> (diskless) Primary (DataReply)
* SyncSource -> SyncTarget (RSDataReply)
*/
-int drbd_send_block(drbd_dev *mdev, Drbd_Packet_Cmd cmd,
+int drbd_send_block(struct drbd_conf *mdev, enum Drbd_Packet_Cmd cmd,
struct Tl_epoch_entry *e)
{
int ok;
- Drbd_Data_Packet p;
+ struct Drbd_Data_Packet p;
p.head.magic = BE_DRBD_MAGIC;
p.head.command = cpu_to_be16(cmd);
- p.head.length = cpu_to_be16( sizeof(p)-sizeof(Drbd_Header) + e->size);
+ p.head.length = cpu_to_be16( sizeof(p)-sizeof(struct Drbd_Header) + e->size);
p.sector = cpu_to_be64(e->sector);
p.block_id = e->block_id;
@@ -1744,7 +1744,7 @@
/*
* you must have down()ed the appropriate [m]sock_mutex elsewhere!
*/
-int drbd_send(drbd_dev *mdev, struct socket *sock,
+int drbd_send(struct drbd_conf *mdev, struct socket *sock,
void *buf, size_t size, unsigned msg_flags)
{
#if !HAVE_KERNEL_SENDMSG
@@ -1840,9 +1840,9 @@
return sent;
}
-STATIC int drbd_open(struct inode *inode, struct file *file)
+int drbd_open(struct inode *inode, struct file *file)
{
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
unsigned long flags;
int rv = 0;
@@ -1865,10 +1865,10 @@
return rv;
}
-STATIC int drbd_close(struct inode *inode, struct file *file)
+int drbd_close(struct inode *inode, struct file *file)
{
/* do not use *file (May be NULL, in case of a unmount :-) */
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
mdev = minor_to_mdev(MINOR(inode->i_rdev));
if (!mdev) return -ENODEV;
@@ -1884,9 +1884,9 @@
return 0;
}
-STATIC void drbd_unplug_fn(request_queue_t *q)
+void drbd_unplug_fn(request_queue_t *q)
{
- drbd_dev *mdev = q->queuedata;
+ struct drbd_conf *mdev = q->queuedata;
MTRACE(TraceTypeUnplug, TraceLvlSummary,
INFO("got unplugged ap_bio_count=%d\n",
@@ -1916,16 +1916,16 @@
if (mdev->state.disk >= Inconsistent) drbd_kick_lo(mdev);
}
-void drbd_set_defaults(drbd_dev *mdev)
+void drbd_set_defaults(struct drbd_conf *mdev)
{
mdev->sync_conf.after = DRBD_AFTER_DEF;
mdev->sync_conf.rate = DRBD_RATE_DEF;
mdev->sync_conf.al_extents = DRBD_AL_EXTENTS_DEF; /* 512 MB active set */
- mdev->state = (drbd_state_t) {
+ mdev->state = (union drbd_state_t) {
{ Secondary, Unknown, StandAlone, Diskless, DUnknown, 0 } };
}
-void drbd_init_set_defaults(drbd_dev *mdev)
+void drbd_init_set_defaults(struct drbd_conf *mdev)
{
/* the memset(,0,) did most of this.
* note: only assignments, no allocation in here */
@@ -1994,7 +1994,7 @@
#endif
}
-void drbd_mdev_cleanup(drbd_dev *mdev)
+void drbd_mdev_cleanup(struct drbd_conf *mdev)
{
/* I'd like to cleanup completely, and memset(,0,) it.
* but I'd have to reinit it.
@@ -2118,7 +2118,7 @@
/* caches */
drbd_request_cache = drbd_kmem_cache_create(
- "drbd_req_cache", sizeof(drbd_request_t),
+ "drbd_req_cache", sizeof(struct drbd_request),
0, 0, NULL);
if (drbd_request_cache == NULL)
goto Enomem;
@@ -2158,7 +2158,7 @@
return -ENOMEM;
}
-STATIC int drbd_notify_sys(struct notifier_block *this, unsigned long code,
+int drbd_notify_sys(struct notifier_block *this, unsigned long code,
void *unused)
{
/* just so we have it. you never know what interessting things we
@@ -2168,12 +2168,12 @@
return NOTIFY_DONE;
}
-STATIC struct notifier_block drbd_notifier = {
+struct notifier_block drbd_notifier = {
.notifier_call = drbd_notify_sys,
};
-STATIC void __exit drbd_cleanup(void)
+void __exit drbd_cleanup(void)
{
int i, rr;
@@ -2186,7 +2186,7 @@
remove_proc_entry("drbd", &proc_root);
i = minor_count;
while (i--) {
- drbd_dev *mdev = minor_to_mdev(i);
+ struct drbd_conf *mdev = minor_to_mdev(i);
struct gendisk **disk = &mdev->vdisk;
request_queue_t **q = &mdev->rq_queue;
@@ -2268,13 +2268,13 @@
printk(KERN_INFO DEVICE_NAME": module cleanup done.\n");
}
-drbd_dev *drbd_new_device(int minor)
+struct drbd_conf *drbd_new_device(int minor)
{
- drbd_dev *mdev = NULL;
+ struct drbd_conf *mdev = NULL;
struct gendisk *disk;
request_queue_t *q;
- mdev = kzalloc(sizeof(drbd_dev), GFP_KERNEL);
+ mdev = kzalloc(sizeof(struct drbd_conf), GFP_KERNEL);
if (!mdev) goto Enomem;
mdev->minor = minor;
@@ -2341,7 +2341,7 @@
THIS_MODULE, THIS_MODULE->module_core);
#endif
- if (sizeof(Drbd_HandShake_Packet) != 80) {
+ if (sizeof(struct Drbd_HandShake_Packet) != 80) {
printk(KERN_ERR DEVICE_NAME
": never change the size or layout of the HandShake packet.\n");
return -EINVAL;
@@ -2378,7 +2378,7 @@
init_waitqueue_head(&drbd_pp_wait);
drbd_proc = NULL; /* play safe for drbd_cleanup */
- minor_table = kzalloc(sizeof(drbd_dev *)*minor_count, GFP_KERNEL);
+ minor_table = kzalloc(sizeof(struct drbd_conf *)*minor_count, GFP_KERNEL);
if (!minor_table) goto Enomem;
err = drbd_create_mempools();
@@ -2433,7 +2433,7 @@
kfree(bc);
}
-void drbd_free_sock(drbd_dev *mdev)
+void drbd_free_sock(struct drbd_conf *mdev)
{
if (mdev->data.socket) {
sock_release(mdev->data.socket);
@@ -2446,7 +2446,7 @@
}
-void drbd_free_resources(drbd_dev *mdev)
+void drbd_free_resources(struct drbd_conf *mdev)
{
if (mdev->cram_hmac_tfm) {
crypto_free_hash(mdev->cram_hmac_tfm);
@@ -2481,7 +2481,7 @@
* drbd_md_sync:
* Writes the meta data super block if the MD_DIRTY flag bit is set.
*/
-void drbd_md_sync(drbd_dev *mdev)
+void drbd_md_sync(struct drbd_conf *mdev)
{
struct meta_data_on_disk *buffer;
sector_t sector;
@@ -2551,7 +2551,7 @@
* enum ret_codes in case something goes wrong.
* Currently only: MDIOError, MDInvalid.
*/
-int drbd_md_read(drbd_dev *mdev, struct drbd_backing_dev *bdev)
+int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev)
{
struct meta_data_on_disk *buffer;
int i, rv = NoError;
@@ -2626,14 +2626,14 @@
* the meta-data super block. This function sets MD_DIRTY, and starts a
* timer that ensures that within five seconds you have to call drbd_md_sync().
*/
-void drbd_md_mark_dirty(drbd_dev *mdev)
+void drbd_md_mark_dirty(struct drbd_conf *mdev)
{
set_bit(MD_DIRTY, &mdev->flags);
mod_timer(&mdev->md_sync_timer, jiffies + 5*HZ );
}
-STATIC void drbd_uuid_move_history(drbd_dev *mdev)
+void drbd_uuid_move_history(struct drbd_conf *mdev)
{
int i;
@@ -2646,7 +2646,7 @@
}
}
-void _drbd_uuid_set(drbd_dev *mdev, int idx, u64 val)
+void _drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val)
{
if (idx == Current) {
if (mdev->state.role == Primary)
@@ -2665,7 +2665,7 @@
}
-void drbd_uuid_set(drbd_dev *mdev, int idx, u64 val)
+void drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val)
{
if (mdev->bc->md.uuid[idx]) {
drbd_uuid_move_history(mdev);
@@ -2677,7 +2677,7 @@
_drbd_uuid_set(mdev, idx, val);
}
-void drbd_uuid_new_current(drbd_dev *mdev)
+void drbd_uuid_new_current(struct drbd_conf *mdev)
{
INFO("Creating new current UUID\n");
D_ASSERT(mdev->bc->md.uuid[Bitmap] == 0);
@@ -2699,7 +2699,7 @@
drbd_md_mark_dirty(mdev);
}
-void drbd_uuid_set_bm(drbd_dev *mdev, u64 val)
+void drbd_uuid_set_bm(struct drbd_conf *mdev, u64 val)
{
if (mdev->bc->md.uuid[Bitmap] == 0 && val == 0) return;
@@ -2726,7 +2726,7 @@
}
-void drbd_md_set_flag(drbd_dev *mdev, int flag)
+void drbd_md_set_flag(struct drbd_conf *mdev, int flag)
{
MUST_HOLD(mdev->req_lock);
if ( (mdev->bc->md.flags & flag) != flag) {
@@ -2734,7 +2734,7 @@
mdev->bc->md.flags |= flag;
}
}
-void drbd_md_clear_flag(drbd_dev *mdev, int flag)
+void drbd_md_clear_flag(struct drbd_conf *mdev, int flag)
{
MUST_HOLD(mdev->req_lock);
if ( (mdev->bc->md.flags & flag) != 0 ) {
@@ -2747,14 +2747,14 @@
return ((bdev->md.flags & flag) != 0);
}
-STATIC void md_sync_timer_fn(unsigned long data)
+void md_sync_timer_fn(unsigned long data)
{
- drbd_dev *mdev = (drbd_dev *) data;
+ struct drbd_conf *mdev = (struct drbd_conf *) data;
drbd_queue_work_front(&mdev->data.work, &mdev->md_sync_work);
}
-STATIC int w_md_sync(drbd_dev *mdev, struct drbd_work *w, int unused)
+int w_md_sync(struct drbd_conf *mdev, struct drbd_work *w, int unused)
{
WARN("BUG! md_sync_timer expired! Worker calls drbd_md_sync().\n");
drbd_md_sync(mdev);
@@ -2778,7 +2778,7 @@
* Crude but fast random-number generator. Uses a linear congruential
* generator, with occasional help from get_random_bytes().
*/
-STATIC unsigned long
+unsigned long
_drbd_fault_random(struct fault_random_state *rsp)
{
long refresh;
@@ -2792,7 +2792,7 @@
return swahw32(rsp->state);
}
-STATIC char *
+char *
_drbd_fault_str(unsigned int type) {
static char *_faults[] = {
"Meta-data write",
@@ -2808,7 +2808,7 @@
}
unsigned int
-_drbd_insert_fault(drbd_dev *mdev, unsigned int type)
+_drbd_insert_fault(struct drbd_conf *mdev, unsigned int type)
{
static struct fault_random_state rrs = {0, 0};
@@ -2829,7 +2829,7 @@
#ifdef ENABLE_DYNAMIC_TRACE
-STATIC char *_drbd_uuid_str(unsigned int idx)
+char *_drbd_uuid_str(unsigned int idx)
{
static char *uuid_str[] = {
"Current",
@@ -2845,7 +2845,7 @@
/* Pretty print a UUID value */
void
-drbd_print_uuid(drbd_dev *mdev, unsigned int idx) {
+drbd_print_uuid(struct drbd_conf *mdev, unsigned int idx) {
INFO(" uuid[%s] now %016llX\n", _drbd_uuid_str(idx), mdev->bc->md.uuid[idx]);
}
@@ -2998,7 +2998,7 @@
} \
} while (0)
-STATIC char *dump_st(char *p, int len, drbd_state_t mask, drbd_state_t val)
+char *dump_st(char *p, int len, union drbd_state_t mask, union drbd_state_t val)
{
char *op = p;
*p = '\0';
@@ -3037,13 +3037,13 @@
}
void
-_dump_packet(drbd_dev *mdev, struct socket *sock,
- int recv, Drbd_Polymorph_Packet *p, char *file, int line)
+_dump_packet(struct drbd_conf *mdev, struct socket *sock,
+ int recv, union Drbd_Polymorph_Packet *p, char *file, int line)
{
char *sockname = sock == mdev->meta.socket ? "meta" : "data";
int cmd = (recv == 2) ? p->head.command : be16_to_cpu(p->head.command);
char tmp[300];
- drbd_state_t m, v;
+ union drbd_state_t m, v;
switch (cmd) {
case HandShake:
@@ -3150,7 +3150,7 @@
/* Debug routine to dump info about bio */
-void _dump_bio(drbd_dev *mdev, struct bio *bio, int complete)
+void _dump_bio(struct drbd_conf *mdev, struct bio *bio, int complete)
{
#ifdef CONFIG_LBD
#define SECTOR_FORMAT "%Lx"
Modified: branches/drbd-8.0-for-linus/drbd/drbd_nl.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_nl.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_nl.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -47,7 +47,7 @@
/* Generate the tag_list to struct functions */
#define PACKET(name, number, fields) \
-int name ## _from_tags (drbd_dev *mdev, unsigned short *tags, struct name *arg) \
+int name ## _from_tags (struct drbd_conf *mdev, unsigned short *tags, struct name *arg) \
{ \
int tag; \
int dlen; \
@@ -88,7 +88,7 @@
/* Generate the struct to tag_list functions */
#define PACKET(name, number, fields) \
unsigned short* \
-name ## _to_tags (drbd_dev *mdev, struct name *arg, unsigned short *tags) \
+name ## _to_tags (struct drbd_conf *mdev, struct name *arg, unsigned short *tags) \
{ \
fields \
return tags; \
@@ -116,8 +116,8 @@
tags = (unsigned short *)((char *)tags + arg->member ## _len);
#include "linux/drbd_nl.h"
-extern void drbd_init_set_defaults(drbd_dev *mdev);
-void drbd_bcast_ev_helper(drbd_dev *mdev, char *helper_name);
+extern void drbd_init_set_defaults(struct drbd_conf *mdev);
+void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name);
void drbd_nl_send_reply(struct cn_msg *, int);
char *nl_packet_name(int packet_type)
@@ -165,7 +165,7 @@
req->seq, req->ack, req->len);
}
-int drbd_khelper(drbd_dev *mdev, char *cmd)
+int drbd_khelper(struct drbd_conf *mdev, char *cmd)
{
char mb[12];
char *argv[] = {usermode_helper, cmd, mb, NULL };
@@ -182,10 +182,10 @@
return call_usermodehelper(usermode_helper, argv, envp, 1);
}
-drbd_disks_t drbd_try_outdate_peer(drbd_dev *mdev)
+enum drbd_disk_state drbd_try_outdate_peer(struct drbd_conf *mdev)
{
int r;
- drbd_disks_t nps;
+ enum drbd_disk_state nps;
enum fencing_policy fp;
D_ASSERT(mdev->state.pdsk == DUnknown);
@@ -236,11 +236,11 @@
}
-int drbd_set_role(drbd_dev *mdev, drbd_role_t new_role, int force)
+int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force)
{
int r = 0, forced = 0, try = 0;
- drbd_state_t mask, val;
- drbd_disks_t nps;
+ union drbd_state_t mask, val;
+ enum drbd_disk_state nps;
if (new_role == Primary)
request_ping(mdev); /* Detect a dead peer ASAP */
@@ -363,7 +363,7 @@
}
-STATIC int drbd_nl_primary(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_primary(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
struct primary primary_args;
@@ -379,7 +379,7 @@
return 0;
}
-STATIC int drbd_nl_secondary(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_secondary(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
reply->ret_code = drbd_set_role(mdev, Secondary, 0);
@@ -389,7 +389,7 @@
/* initializes the md.*_offset members, so we are able to find
* the on disk meta data */
-STATIC void drbd_md_set_sector_offsets(drbd_dev *mdev,
+void drbd_md_set_sector_offsets(struct drbd_conf *mdev,
struct drbd_backing_dev *bdev)
{
sector_t md_size_sect = 0;
@@ -447,7 +447,7 @@
/* You should call drbd_md_sync() after calling this.
*/
-int drbd_determin_dev_size(struct Drbd_Conf *mdev)
+int drbd_determin_dev_size(struct drbd_conf *mdev)
{
sector_t prev_first_sect, prev_size; /* previous meta location */
sector_t la_size;
@@ -522,7 +522,7 @@
}
sector_t
-drbd_new_dev_size(struct Drbd_Conf *mdev, struct drbd_backing_dev *bdev)
+drbd_new_dev_size(struct drbd_conf *mdev, struct drbd_backing_dev *bdev)
{
sector_t p_size = mdev->p_size; /* partner's disk size. */
sector_t la_size = bdev->md.la_size_sect; /* last agreed size. */
@@ -566,7 +566,7 @@
* -ENOMEM when allocation failed, and 0 on success. You should call
* drbd_md_sync() after you called this function.
*/
-STATIC int drbd_check_al_size(drbd_dev *mdev)
+int drbd_check_al_size(struct drbd_conf *mdev)
{
struct lru_cache *n, *t;
struct lc_element *e;
@@ -613,7 +613,7 @@
return 0;
}
-void drbd_setup_queue_param(drbd_dev *mdev, unsigned int max_seg_s)
+void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s)
{
request_queue_t * const q = mdev->rq_queue;
request_queue_t * const b = mdev->bc->backing_bdev->bd_disk->queue;
@@ -672,14 +672,14 @@
/* does always return 0;
* interesting return code is in reply->ret_code */
-STATIC int drbd_nl_disk_conf(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
enum ret_codes retcode;
struct drbd_backing_dev *nbc = NULL; /* new_backing_conf */
struct inode *inode, *inode2;
struct lru_cache *resync_lru = NULL;
- drbd_state_t ns, os;
+ union drbd_state_t ns, os;
int rv, ntries = 0;
/* if you want to reconfigure, please tear down first */
@@ -992,7 +992,7 @@
return 0;
}
-STATIC int drbd_nl_detach(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_detach(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
fsync_bdev(mdev->this_bdev);
@@ -1003,7 +1003,7 @@
#define HMAC_NAME_L 20
-STATIC int drbd_nl_net_conf(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_net_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
int i, ns;
@@ -1012,7 +1012,7 @@
struct crypto_hash *tfm = NULL;
struct hlist_head *new_tl_hash = NULL;
struct hlist_head *new_ee_hash = NULL;
- drbd_dev *odev;
+ struct drbd_conf *odev;
char hmac_name[HMAC_NAME_L];
if (mdev->state.conn > StandAlone) {
@@ -1187,7 +1187,7 @@
return 0;
}
-STATIC int drbd_nl_disconnect(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_disconnect(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
int retcode;
@@ -1228,7 +1228,7 @@
return 0;
}
-STATIC int drbd_nl_resize(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_resize(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
struct resize rs;
@@ -1272,12 +1272,12 @@
return 0;
}
-STATIC int drbd_nl_syncer_conf(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_syncer_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
int retcode = NoError;
struct syncer_conf sc;
- drbd_dev *odev;
+ struct drbd_conf *odev;
int err;
memcpy(&sc, &mdev->sync_conf, sizeof(struct syncer_conf));
@@ -1341,7 +1341,7 @@
return 0;
}
-STATIC int drbd_nl_invalidate(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_invalidate(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
reply->ret_code = drbd_request_state(mdev, NS2(conn, StartingSyncT,
@@ -1349,7 +1349,7 @@
return 0;
}
-STATIC int drbd_nl_invalidate_peer(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_invalidate_peer(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
@@ -1359,7 +1359,7 @@
return 0;
}
-STATIC int drbd_nl_pause_sync(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_pause_sync(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
int retcode = NoError;
@@ -1371,7 +1371,7 @@
return 0;
}
-STATIC int drbd_nl_resume_sync(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_resume_sync(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
int retcode = NoError;
@@ -1383,7 +1383,7 @@
return 0;
}
-STATIC int drbd_nl_suspend_io(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_suspend_io(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
reply->ret_code = drbd_request_state(mdev, NS(susp, 1));
@@ -1391,18 +1391,18 @@
return 0;
}
-STATIC int drbd_nl_resume_io(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_resume_io(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
reply->ret_code = drbd_request_state(mdev, NS(susp, 0));
return 0;
}
-STATIC int drbd_nl_outdate(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_outdate(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
int retcode;
- drbd_state_t os, ns;
+ union drbd_state_t os, ns;
spin_lock_irq(&mdev->req_lock);
os = mdev->state;
@@ -1427,7 +1427,7 @@
return 0;
}
-STATIC int drbd_nl_get_config(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_get_config(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
unsigned short *tl;
@@ -1450,7 +1450,7 @@
return (int)((char *)tl - (char *)reply->tag_list);
}
-STATIC int drbd_nl_get_state(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_get_state(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
unsigned short *tl;
@@ -1463,7 +1463,7 @@
return (int)((char *)tl - (char *)reply->tag_list);
}
-STATIC int drbd_nl_get_uuids(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_get_uuids(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
unsigned short *tl;
@@ -1488,7 +1488,7 @@
}
-STATIC int drbd_nl_get_timeout_flag(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
+int drbd_nl_get_timeout_flag(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
struct drbd_nl_cfg_reply *reply)
{
unsigned short *tl;
@@ -1505,9 +1505,9 @@
return (int)((char *)tl - (char *)reply->tag_list);
}
-STATIC drbd_dev *ensure_mdev(struct drbd_nl_cfg_req *nlp)
+struct drbd_conf *ensure_mdev(struct drbd_nl_cfg_req *nlp)
{
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
mdev = minor_to_mdev(nlp->drbd_minor);
@@ -1535,7 +1535,7 @@
}
struct cn_handler_struct {
- int (*function)(drbd_dev *,
+ int (*function)(struct drbd_conf *,
struct drbd_nl_cfg_req *,
struct drbd_nl_cfg_reply* );
int reply_body_size;
@@ -1577,7 +1577,7 @@
struct cn_handler_struct *cm;
struct cn_msg *cn_reply;
struct drbd_nl_cfg_reply *reply;
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
int retcode, rr;
int reply_size = sizeof(struct cn_msg)
+ sizeof(struct drbd_nl_cfg_reply)
@@ -1640,7 +1640,7 @@
atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
-void drbd_bcast_state(drbd_dev *mdev)
+void drbd_bcast_state(struct drbd_conf *mdev)
{
char buffer[sizeof(struct cn_msg)+
sizeof(struct drbd_nl_cfg_reply)+
@@ -1673,7 +1673,7 @@
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_KERNEL);
}
-void drbd_bcast_ev_helper(drbd_dev *mdev, char *helper_name)
+void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
{
char buffer[sizeof(struct cn_msg)+
sizeof(struct drbd_nl_cfg_reply)+
@@ -1711,7 +1711,7 @@
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_KERNEL);
}
-void drbd_bcast_sync_progress(drbd_dev *mdev)
+void drbd_bcast_sync_progress(struct drbd_conf *mdev)
{
char buffer[sizeof(struct cn_msg)+
sizeof(struct drbd_nl_cfg_reply)+
Modified: branches/drbd-8.0-for-linus/drbd/drbd_proc.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_proc.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_proc.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -38,7 +38,7 @@
#include "drbd_int.h"
#include "lru_cache.h" /* for lc_sprintf_stats */
-STATIC int drbd_proc_open(struct inode *inode, struct file *file);
+int drbd_proc_open(struct inode *inode, struct file *file);
struct proc_dir_entry *drbd_proc;
@@ -56,7 +56,7 @@
* [=====>..............] 33.5% (23456/123456)
* finish: 2:20:20 speed: 6,345 (6,456) K/sec
*/
-STATIC void drbd_syncer_progress(struct Drbd_Conf *mdev, struct seq_file *seq)
+void drbd_syncer_progress(struct drbd_conf *mdev, struct seq_file *seq)
{
unsigned long res , db, dt, dbdt, rt, rs_left;
@@ -158,7 +158,7 @@
}
#if 0
-STATIC void resync_dump_detail(struct seq_file *seq, struct lc_element *e)
+void resync_dump_detail(struct seq_file *seq, struct lc_element *e)
{
struct bm_extent *bme = (struct bm_extent *)e;
@@ -169,11 +169,11 @@
}
#endif
-STATIC int drbd_seq_show(struct seq_file *seq, void *v)
+int drbd_seq_show(struct seq_file *seq, void *v)
{
int i, hole = 0;
const char *sn;
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
seq_printf(seq, "version: " REL_VERSION " (api:%d/proto:%d)\n%s\n",
API_VERSION, PRO_VERSION, drbd_buildtag());
@@ -258,7 +258,7 @@
return 0;
}
-STATIC int drbd_proc_open(struct inode *inode, struct file *file)
+int drbd_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, drbd_seq_show, PDE(inode)->data);
}
Modified: branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_receiver.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_receiver.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -57,7 +57,7 @@
#endif
#ifdef DBG_ASSERTS
-void drbd_assert_breakpoint(drbd_dev *mdev, char *exp,
+void drbd_assert_breakpoint(struct drbd_conf *mdev, char *exp,
char *file, int line)
{
ERR("ASSERT( %s ) in %s:%d\n", exp, file, line);
@@ -67,7 +67,7 @@
#if 0
#define CHECK_LIST_LIMIT 1000
-void check_list(drbd_dev *mdev, struct list_head *list, char *t)
+void check_list(struct drbd_conf *mdev, struct list_head *list, char *t)
{
struct list_head *le, *la;
int forward = 0, backward = 0;
@@ -120,7 +120,7 @@
/**
* drbd_bp_alloc: Returns a page. Fails only if a signal comes in.
*/
-STATIC struct page *drbd_pp_alloc(drbd_dev *mdev, unsigned int gfp_mask)
+struct page *drbd_pp_alloc(struct drbd_conf *mdev, unsigned int gfp_mask)
{
unsigned long flags = 0;
struct page *page;
@@ -192,7 +192,7 @@
return page;
}
-STATIC void drbd_pp_free(drbd_dev *mdev, struct page *page)
+void drbd_pp_free(struct drbd_conf *mdev, struct page *page)
{
unsigned long flags = 0;
int free_it;
@@ -235,7 +235,7 @@
drbd_wait_ee_list_empty()
*/
-struct Tl_epoch_entry *drbd_alloc_ee(drbd_dev *mdev,
+struct Tl_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev,
u64 id,
sector_t sector,
unsigned int data_size,
@@ -328,7 +328,7 @@
return NULL;
}
-void drbd_free_ee(drbd_dev *mdev, struct Tl_epoch_entry *e)
+void drbd_free_ee(struct drbd_conf *mdev, struct Tl_epoch_entry *e)
{
struct bio *bio = e->private_bio;
struct bio_vec *bvec;
@@ -351,7 +351,7 @@
}
/* currently on module unload only */
-int drbd_release_ee(drbd_dev *mdev, struct list_head *list)
+int drbd_release_ee(struct drbd_conf *mdev, struct list_head *list)
{
int count = 0;
struct Tl_epoch_entry *e;
@@ -371,7 +371,7 @@
}
-STATIC void reclaim_net_ee(drbd_dev *mdev)
+void reclaim_net_ee(struct drbd_conf *mdev)
{
struct Tl_epoch_entry *e;
struct list_head *le, *tle;
@@ -399,7 +399,7 @@
* Grab done_ee, call all callbacks, free the entries.
* The callbacks typically send out ACKs.
*/
-STATIC int drbd_process_done_ee(drbd_dev *mdev)
+int drbd_process_done_ee(struct drbd_conf *mdev)
{
LIST_HEAD(work_list);
struct Tl_epoch_entry *e, *t;
@@ -434,7 +434,7 @@
/* clean-up helper for drbd_disconnect */
-void _drbd_clear_done_ee(drbd_dev *mdev)
+void _drbd_clear_done_ee(struct drbd_conf *mdev)
{
struct list_head *le;
struct Tl_epoch_entry *e;
@@ -459,7 +459,7 @@
sub_unacked(mdev, n);
}
-void _drbd_wait_ee_list_empty(drbd_dev *mdev, struct list_head *head)
+void _drbd_wait_ee_list_empty(struct drbd_conf *mdev, struct list_head *head)
{
DEFINE_WAIT(wait);
MUST_HOLD(&mdev->req_lock);
@@ -475,14 +475,14 @@
}
}
-void drbd_wait_ee_list_empty(drbd_dev *mdev, struct list_head *head)
+void drbd_wait_ee_list_empty(struct drbd_conf *mdev, struct list_head *head)
{
spin_lock_irq(&mdev->req_lock);
_drbd_wait_ee_list_empty(mdev, head);
spin_unlock_irq(&mdev->req_lock);
}
-STATIC struct socket *drbd_accept(drbd_dev *mdev, struct socket *sock)
+struct socket *drbd_accept(struct drbd_conf *mdev, struct socket *sock)
{
struct socket *newsock;
int err = 0;
@@ -511,7 +511,7 @@
return 0;
}
-STATIC int drbd_recv_short(drbd_dev *mdev, struct socket *sock,
+int drbd_recv_short(struct drbd_conf *mdev, struct socket *sock,
void *buf, size_t size)
{
mm_segment_t oldfs;
@@ -539,7 +539,7 @@
return rv;
}
-int drbd_recv(drbd_dev *mdev, void *buf, size_t size)
+int drbd_recv(struct drbd_conf *mdev, void *buf, size_t size)
{
mm_segment_t oldfs;
struct iovec iov;
@@ -593,7 +593,7 @@
return rv;
}
-STATIC struct socket *drbd_try_connect(drbd_dev *mdev)
+struct socket *drbd_try_connect(struct drbd_conf *mdev)
{
int err;
struct socket *sock;
@@ -644,7 +644,7 @@
return sock;
}
-STATIC struct socket *drbd_wait_for_connect(drbd_dev *mdev)
+struct socket *drbd_wait_for_connect(struct drbd_conf *mdev)
{
int err;
struct socket *sock, *sock2;
@@ -679,19 +679,19 @@
return sock;
}
-STATIC int drbd_do_handshake(drbd_dev *mdev);
-STATIC int drbd_do_auth(drbd_dev *mdev);
+int drbd_do_handshake(struct drbd_conf *mdev);
+int drbd_do_auth(struct drbd_conf *mdev);
-STATIC int drbd_send_fp(drbd_dev *mdev, struct socket *sock, Drbd_Packet_Cmd cmd)
+int drbd_send_fp(struct drbd_conf *mdev, struct socket *sock, enum Drbd_Packet_Cmd cmd)
{
- Drbd_Header *h = (Drbd_Header *) &mdev->data.sbuf.head;
+ struct Drbd_Header *h = (struct Drbd_Header *) &mdev->data.sbuf.head;
return _drbd_send_cmd(mdev, sock, cmd, h, sizeof(*h), 0);
}
-STATIC Drbd_Packet_Cmd drbd_recv_fp(drbd_dev *mdev, struct socket *sock)
+enum Drbd_Packet_Cmd drbd_recv_fp(struct drbd_conf *mdev, struct socket *sock)
{
- Drbd_Header *h = (Drbd_Header *) &mdev->data.sbuf.head;
+ struct Drbd_Header *h = (struct Drbd_Header *) &mdev->data.sbuf.head;
int rr;
rr = drbd_recv_short(mdev, sock, h, sizeof(*h));
@@ -709,7 +709,7 @@
* -1 peer talks different language,
* no point in trying again, please go standalone.
*/
-int drbd_connect(drbd_dev *mdev)
+int drbd_connect(struct drbd_conf *mdev)
{
struct socket *s, *sock, *msock;
int try, h;
@@ -844,7 +844,7 @@
return 1;
}
-STATIC int drbd_recv_header(drbd_dev *mdev, Drbd_Header *h)
+int drbd_recv_header(struct drbd_conf *mdev, struct Drbd_Header *h)
{
int r;
@@ -867,11 +867,11 @@
return TRUE;
}
-STATIC int receive_Barrier_no_tcq(drbd_dev *mdev, Drbd_Header *h)
+int receive_Barrier_no_tcq(struct drbd_conf *mdev, struct Drbd_Header *h)
{
int rv;
int epoch_size;
- Drbd_Barrier_Packet *p = (Drbd_Barrier_Packet *)h;
+ struct Drbd_Barrier_Packet *p = (struct Drbd_Barrier_Packet *)h;
ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;
@@ -909,8 +909,8 @@
/* used from receive_RSDataReply (recv_resync_read)
* and from receive_Data */
-STATIC struct Tl_epoch_entry *
-read_in_block(drbd_dev *mdev, u64 id, sector_t sector, int data_size)
+struct Tl_epoch_entry *
+read_in_block(struct drbd_conf *mdev, u64 id, sector_t sector, int data_size)
{
struct Tl_epoch_entry *e;
struct bio_vec *bvec;
@@ -942,8 +942,8 @@
/* drbd_drain_block() just takes a data block out of the socket input
* buffer and discards ist.
*/
-STATIC int
-drbd_drain_block(drbd_dev *mdev, int data_size)
+int
+drbd_drain_block(struct drbd_conf *mdev, int data_size)
{
struct page *page;
int rr, rv = 1;
@@ -972,14 +972,14 @@
/* kick lower level device, if we have more than (arbitrary number)
* reference counts on it, which typically are locally submitted io
* requests. don't use unacked_cnt, so we speed up proto A and B, too. */
-static void maybe_kick_lo(drbd_dev *mdev)
+static void maybe_kick_lo(struct drbd_conf *mdev)
{
/* FIXME hysteresis ?? */
if (atomic_read(&mdev->local_cnt) >= mdev->net_conf->unplug_watermark)
drbd_kick_lo(mdev);
}
-STATIC int recv_dless_read(drbd_dev *mdev, drbd_request_t *req,
+int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req,
sector_t sector, int data_size)
{
struct bio_vec *bvec;
@@ -1010,7 +1010,7 @@
/* e_end_resync_block() is called via
* drbd_process_done_ee() by asender only */
-STATIC int e_end_resync_block(drbd_dev *mdev, struct drbd_work *w, int unused)
+int e_end_resync_block(struct drbd_conf *mdev, struct drbd_work *w, int unused)
{
struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
sector_t sector = e->sector;
@@ -1033,7 +1033,7 @@
return ok;
}
-STATIC int recv_resync_read(drbd_dev *mdev, sector_t sector, int data_size)
+int recv_resync_read(struct drbd_conf *mdev, sector_t sector, int data_size)
{
struct Tl_epoch_entry *e;
@@ -1064,13 +1064,13 @@
return TRUE;
}
-STATIC int receive_DataReply(drbd_dev *mdev, Drbd_Header *h)
+int receive_DataReply(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- drbd_request_t *req;
+ struct drbd_request *req;
sector_t sector;
unsigned int header_size, data_size;
int ok;
- Drbd_Data_Packet *p = (Drbd_Data_Packet *)h;
+ struct Drbd_Data_Packet *p = (struct Drbd_Data_Packet *)h;
header_size = sizeof(*p) - sizeof(*h);
data_size = h->length - header_size;
@@ -1108,12 +1108,12 @@
return ok;
}
-STATIC int receive_RSDataReply(drbd_dev *mdev, Drbd_Header *h)
+int receive_RSDataReply(struct drbd_conf *mdev, struct Drbd_Header *h)
{
sector_t sector;
unsigned int header_size, data_size;
int ok;
- Drbd_Data_Packet *p = (Drbd_Data_Packet *)h;
+ struct Drbd_Data_Packet *p = (struct Drbd_Data_Packet *)h;
header_size = sizeof(*p) - sizeof(*h);
data_size = h->length - header_size;
@@ -1160,7 +1160,7 @@
* for a broken example implementation of the TCQ barrier version of
* e_end_block see older revisions...
*/
-STATIC int e_end_block(drbd_dev *mdev, struct drbd_work *w, int unused)
+int e_end_block(struct drbd_conf *mdev, struct drbd_work *w, int unused)
{
struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
sector_t sector = e->sector;
@@ -1207,7 +1207,7 @@
return ok;
}
-STATIC int e_send_discard_ack(drbd_dev *mdev, struct drbd_work *w, int unused)
+int e_send_discard_ack(struct drbd_conf *mdev, struct drbd_work *w, int unused)
{
struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
int ok = 1;
@@ -1248,7 +1248,7 @@
*
* returns 0 if we may process the packet,
* -ERESTARTSYS if we were interrupted (by disconnect signal). */
-static int drbd_wait_peer_seq(drbd_dev *mdev, const u32 packet_seq)
+static int drbd_wait_peer_seq(struct drbd_conf *mdev, const u32 packet_seq)
{
DEFINE_WAIT(wait);
int ret = 0;
@@ -1273,11 +1273,11 @@
}
/* mirrored write */
-STATIC int receive_Data(drbd_dev *mdev, Drbd_Header *h)
+int receive_Data(struct drbd_conf *mdev, struct Drbd_Header *h)
{
sector_t sector;
struct Tl_epoch_entry *e;
- Drbd_Data_Packet *p = (Drbd_Data_Packet *)h;
+ struct Drbd_Data_Packet *p = (struct Drbd_Data_Packet *)h;
int header_size, data_size;
unsigned int barrier_nr = 0;
unsigned int epoch_size = 0;
@@ -1340,7 +1340,7 @@
const int size = e->size;
const int discard = test_bit(DISCARD_CONCURRENT, &mdev->flags);
DEFINE_WAIT(wait);
- drbd_request_t *i;
+ struct drbd_request *i;
struct hlist_node *n;
struct hlist_head *slot;
int first;
@@ -1569,14 +1569,14 @@
return FALSE;
}
-STATIC int receive_DataRequest(drbd_dev *mdev, Drbd_Header *h)
+int receive_DataRequest(struct drbd_conf *mdev, struct Drbd_Header *h)
{
sector_t sector;
const sector_t capacity = drbd_get_capacity(mdev->this_bdev);
struct Tl_epoch_entry *e;
int size;
unsigned int fault_type;
- Drbd_BlockRequest_Packet *p = (Drbd_BlockRequest_Packet *)h;
+ struct Drbd_BlockRequest_Packet *p = (struct Drbd_BlockRequest_Packet *)h;
ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;
@@ -1656,7 +1656,7 @@
return TRUE;
}
-STATIC int drbd_asb_recover_0p(drbd_dev *mdev)
+int drbd_asb_recover_0p(struct drbd_conf *mdev)
{
int self, peer, rv = -100;
unsigned long ch_self, ch_peer;
@@ -1712,7 +1712,7 @@
return rv;
}
-STATIC int drbd_asb_recover_1p(drbd_dev *mdev)
+int drbd_asb_recover_1p(struct drbd_conf *mdev)
{
int self, peer, hg, rv = -100;
@@ -1756,7 +1756,7 @@
return rv;
}
-STATIC int drbd_asb_recover_2p(drbd_dev *mdev)
+int drbd_asb_recover_2p(struct drbd_conf *mdev)
{
int self, peer, hg, rv = -100;
@@ -1795,7 +1795,7 @@
return rv;
}
-STATIC void drbd_uuid_dump(drbd_dev *mdev, char *text, u64 *uuid)
+void drbd_uuid_dump(struct drbd_conf *mdev, char *text, u64 *uuid)
{
INFO("%s %016llX:%016llX:%016llX:%016llX\n",
text,
@@ -1815,7 +1815,7 @@
-100 after split brain, disconnect
-1000 unrelated data
*/
-STATIC int drbd_uuid_compare(drbd_dev *mdev, int *rule_nr)
+int drbd_uuid_compare(struct drbd_conf *mdev, int *rule_nr)
{
u64 self, peer;
int i, j;
@@ -1898,12 +1898,12 @@
/* drbd_sync_handshake() returns the new conn state on success, or
conn_mask (-1) on failure.
*/
-STATIC drbd_conns_t drbd_sync_handshake(drbd_dev *mdev, drbd_role_t peer_role,
- drbd_disks_t peer_disk)
+enum drbd_conns drbd_sync_handshake(struct drbd_conf *mdev, enum drbd_role peer_role,
+ enum drbd_disk_state peer_disk)
{
int hg, rule_nr;
- drbd_conns_t rv = conn_mask;
- drbd_disks_t mydisk;
+ enum drbd_conns rv = conn_mask;
+ enum drbd_disk_state mydisk;
mydisk = mdev->state.disk;
if (mydisk == Negotiating) mydisk = mdev->new_state_tmp.disk;
@@ -2032,7 +2032,7 @@
}
/* returns 1 if invalid */
-STATIC int cmp_after_sb(enum after_sb_handler peer, enum after_sb_handler self)
+int cmp_after_sb(enum after_sb_handler peer, enum after_sb_handler self)
{
/* DiscardRemote - DiscardLocal is valid */
if ( (peer == DiscardRemote && self == DiscardLocal) ||
@@ -2049,9 +2049,9 @@
return 1;
}
-STATIC int receive_protocol(drbd_dev *mdev, Drbd_Header *h)
+int receive_protocol(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- Drbd_Protocol_Packet *p = (Drbd_Protocol_Packet *)h;
+ struct Drbd_Protocol_Packet *p = (struct Drbd_Protocol_Packet *)h;
int p_proto, p_after_sb_0p, p_after_sb_1p, p_after_sb_2p;
int p_want_lose, p_two_primaries;
@@ -2104,10 +2104,10 @@
return FALSE;
}
-STATIC int receive_SyncParam(drbd_dev *mdev, Drbd_Header *h)
+int receive_SyncParam(struct drbd_conf *mdev, struct Drbd_Header *h)
{
int ok = TRUE;
- Drbd_SyncParam_Packet *p = (Drbd_SyncParam_Packet *)h;
+ struct Drbd_SyncParam_Packet *p = (struct Drbd_SyncParam_Packet *)h;
ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;
if (drbd_recv(mdev, h->payload, h->length) != h->length)
@@ -2119,14 +2119,14 @@
return ok;
}
-STATIC void drbd_setup_order_type(drbd_dev *mdev, int peer)
+void drbd_setup_order_type(struct drbd_conf *mdev, int peer)
{
/* sorry, we currently have no working implementation
* of distributed TCQ */
}
/* warn if the arguments differ by more than 12.5% */
-static void warn_if_differ_considerably(drbd_dev *mdev, const char *s, sector_t a, sector_t b)
+static void warn_if_differ_considerably(struct drbd_conf *mdev, const char *s, sector_t a, sector_t b)
{
sector_t d;
if (a == 0 || b == 0) return;
@@ -2136,12 +2136,12 @@
(unsigned long long)a, (unsigned long long)b);
}
-STATIC int receive_sizes(drbd_dev *mdev, Drbd_Header *h)
+int receive_sizes(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- Drbd_Sizes_Packet *p = (Drbd_Sizes_Packet *)h;
+ struct Drbd_Sizes_Packet *p = (struct Drbd_Sizes_Packet *)h;
unsigned int max_seg_s;
sector_t p_size, p_usize, my_usize;
- drbd_conns_t nconn;
+ enum drbd_conns nconn;
ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;
if (drbd_recv(mdev, h->payload, h->length) != h->length)
@@ -2241,9 +2241,9 @@
return TRUE;
}
-STATIC int receive_uuids(drbd_dev *mdev, Drbd_Header *h)
+int receive_uuids(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- Drbd_GenCnt_Packet *p = (Drbd_GenCnt_Packet *)h;
+ struct Drbd_GenCnt_Packet *p = (struct Drbd_GenCnt_Packet *)h;
u64 *p_uuid;
int i;
@@ -2266,11 +2266,11 @@
* convert_state:
* Switches the view of the state.
*/
-STATIC drbd_state_t convert_state(drbd_state_t ps)
+union drbd_state_t convert_state(union drbd_state_t ps)
{
- drbd_state_t ms;
+ union drbd_state_t ms;
- static drbd_conns_t c_tab[] = {
+ static enum drbd_conns c_tab[] = {
[Connected] = Connected,
[StartingSyncS] = StartingSyncT,
@@ -2292,10 +2292,10 @@
return ms;
}
-STATIC int receive_req_state(drbd_dev *mdev, Drbd_Header *h)
+int receive_req_state(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- Drbd_Req_State_Packet *p = (Drbd_Req_State_Packet *)h;
- drbd_state_t mask, val;
+ struct Drbd_Req_State_Packet *p = (struct Drbd_Req_State_Packet *)h;
+ union drbd_state_t mask, val;
int rv;
ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;
@@ -2320,11 +2320,11 @@
return TRUE;
}
-STATIC int receive_state(drbd_dev *mdev, Drbd_Header *h)
+int receive_state(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- Drbd_State_Packet *p = (Drbd_State_Packet *)h;
- drbd_conns_t nconn, oconn;
- drbd_state_t os, ns, peer_state;
+ struct Drbd_State_Packet *p = (struct Drbd_State_Packet *)h;
+ enum drbd_conns nconn, oconn;
+ union drbd_state_t os, ns, peer_state;
int rv;
ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;
@@ -2391,9 +2391,9 @@
return TRUE;
}
-STATIC int receive_sync_uuid(drbd_dev *mdev, Drbd_Header *h)
+int receive_sync_uuid(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- Drbd_SyncUUID_Packet *p = (Drbd_SyncUUID_Packet *)h;
+ struct Drbd_SyncUUID_Packet *p = (struct Drbd_SyncUUID_Packet *)h;
wait_event( mdev->misc_wait,
mdev->state.conn < Connected || mdev->state.conn == WFSyncUUID);
@@ -2422,7 +2422,7 @@
in order to be agnostic to the 32 vs 64 bits issue.
returns 0 on failure, 1 if we suceessfully received it. */
-STATIC int receive_bitmap(drbd_dev *mdev, Drbd_Header *h)
+int receive_bitmap(struct drbd_conf *mdev, struct Drbd_Header *h)
{
size_t bm_words, bm_i, want, num_words;
unsigned long *buffer;
@@ -2469,7 +2469,7 @@
return ok;
}
-STATIC int receive_skip(drbd_dev *mdev, Drbd_Header *h)
+int receive_skip(struct drbd_conf *mdev, struct Drbd_Header *h)
{
/* TODO zero copy sink :) */
static char sink[128];
@@ -2488,13 +2488,13 @@
return (size == 0);
}
-STATIC int receive_UnplugRemote(drbd_dev *mdev, Drbd_Header *h)
+int receive_UnplugRemote(struct drbd_conf *mdev, struct Drbd_Header *h)
{
if (mdev->state.disk >= Inconsistent) drbd_kick_lo(mdev);
return TRUE; /* cannot fail. */
}
-typedef int (*drbd_cmd_handler_f)(drbd_dev *, Drbd_Header *);
+typedef int (*drbd_cmd_handler_f)(struct drbd_conf *, struct Drbd_Header *);
static drbd_cmd_handler_f drbd_default_handler[] = {
[Data] = receive_Data,
@@ -2522,10 +2522,10 @@
static drbd_cmd_handler_f *drbd_cmd_handler = drbd_default_handler;
static drbd_cmd_handler_f *drbd_opt_cmd_handler;
-STATIC void drbdd(drbd_dev *mdev)
+void drbdd(struct drbd_conf *mdev)
{
drbd_cmd_handler_f handler;
- Drbd_Header *header = &mdev->data.rbuf.head;
+ struct Drbd_Header *header = &mdev->data.rbuf.head;
while (get_t_state(&mdev->receiver) == Running) {
if (!drbd_recv_header(mdev, header))
@@ -2558,11 +2558,11 @@
}
/* FIXME how should freeze-io be handled? */
-STATIC void drbd_fail_pending_reads(drbd_dev *mdev)
+void drbd_fail_pending_reads(struct drbd_conf *mdev)
{
struct hlist_head *slot;
struct hlist_node *n;
- drbd_request_t *req;
+ struct drbd_request *req;
struct list_head *le;
LIST_HEAD(workset);
int i;
@@ -2581,7 +2581,7 @@
while (!list_empty(&workset)) {
le = workset.next;
- req = list_entry(le, drbd_request_t, w.list);
+ req = list_entry(le, struct drbd_request, w.list);
list_del(le);
_req_mod(req, connection_lost_while_pending, 0);
@@ -2589,11 +2589,11 @@
spin_unlock_irq(&mdev->req_lock);
}
-STATIC void drbd_disconnect(drbd_dev *mdev)
+void drbd_disconnect(struct drbd_conf *mdev)
{
struct drbd_work prev_work_done;
enum fencing_policy fp;
- drbd_state_t os, ns;
+ union drbd_state_t os, ns;
int rv = SS_UnknownError;
D_ASSERT(mdev->state.conn < Connected);
@@ -2674,7 +2674,7 @@
if (mdev->state.role == Primary) {
if ( fp >= Resource &&
mdev->state.pdsk >= DUnknown ) {
- drbd_disks_t nps = drbd_try_outdate_peer(mdev);
+ enum drbd_disk_state nps = drbd_try_outdate_peer(mdev);
drbd_request_state(mdev, NS(pdsk, nps));
}
}
@@ -2737,10 +2737,10 @@
*
* for now, they are expected to be zero, but ignored.
*/
-int drbd_send_handshake(drbd_dev *mdev)
+int drbd_send_handshake(struct drbd_conf *mdev)
{
/* ASSERT current == mdev->receiver ... */
- Drbd_HandShake_Packet *p = &mdev->data.sbuf.HandShake;
+ struct Drbd_HandShake_Packet *p = &mdev->data.sbuf.HandShake;
int ok;
if (down_interruptible(&mdev->data.mutex)) {
@@ -2756,7 +2756,7 @@
memset(p, 0, sizeof(*p));
p->protocol_version = cpu_to_be32(PRO_VERSION);
ok = _drbd_send_cmd( mdev, mdev->data.socket, HandShake,
- (Drbd_Header *)p, sizeof(*p), 0 );
+ (struct Drbd_Header *)p, sizeof(*p), 0 );
up(&mdev->data.mutex);
return ok;
}
@@ -2768,11 +2768,11 @@
* -1 peer talks different language,
* no point in trying again, please go standalone.
*/
-STATIC int drbd_do_handshake(drbd_dev *mdev)
+int drbd_do_handshake(struct drbd_conf *mdev)
{
/* ASSERT current == mdev->receiver ... */
- Drbd_HandShake_Packet *p = &mdev->data.rbuf.HandShake;
- const int expect = sizeof(Drbd_HandShake_Packet)-sizeof(Drbd_Header);
+ struct Drbd_HandShake_Packet *p = &mdev->data.rbuf.HandShake;
+ const int expect = sizeof(struct Drbd_HandShake_Packet)-sizeof(struct Drbd_Header);
int rv;
rv = drbd_send_handshake(mdev);
@@ -2846,7 +2846,7 @@
}
#if !defined(CONFIG_CRYPTO_HMAC) && !defined(CONFIG_CRYPTO_HMAC_MODULE)
-STATIC int drbd_do_auth(drbd_dev *mdev)
+int drbd_do_auth(struct drbd_conf *mdev)
{
ERR( "This kernel was build without CONFIG_CRYPTO_HMAC.\n");
ERR( "You need to disable 'cram-hmac-alg' in drbd.conf.\n");
@@ -2854,14 +2854,14 @@
}
#else
#define CHALLENGE_LEN 64
-STATIC int drbd_do_auth(drbd_dev *mdev)
+int drbd_do_auth(struct drbd_conf *mdev)
{
char my_challenge[CHALLENGE_LEN]; /* 64 Bytes... */
struct scatterlist sg;
char *response = NULL;
char *right_response = NULL;
char *peers_ch = NULL;
- Drbd_Header p;
+ struct Drbd_Header p;
unsigned int key_len = strlen(mdev->net_conf->shared_secret);
unsigned int resp_size;
struct hash_desc desc;
@@ -2995,7 +2995,7 @@
int drbdd_init(struct Drbd_thread *thi)
{
- drbd_dev *mdev = thi->mdev;
+ struct drbd_conf *mdev = thi->mdev;
int minor = mdev_to_minor(mdev);
int h;
@@ -3039,9 +3039,9 @@
/* ********* acknowledge sender ******** */
-STATIC int got_RqSReply(drbd_dev *mdev, Drbd_Header *h)
+int got_RqSReply(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- Drbd_RqS_Reply_Packet *p = (Drbd_RqS_Reply_Packet *)h;
+ struct Drbd_RqS_Reply_Packet *p = (struct Drbd_RqS_Reply_Packet *)h;
int retcode = be32_to_cpu(p->retcode);
@@ -3057,13 +3057,13 @@
return TRUE;
}
-STATIC int got_Ping(drbd_dev *mdev, Drbd_Header *h)
+int got_Ping(struct drbd_conf *mdev, struct Drbd_Header *h)
{
return drbd_send_ping_ack(mdev);
}
-STATIC int got_PingAck(drbd_dev *mdev, Drbd_Header *h)
+int got_PingAck(struct drbd_conf *mdev, struct Drbd_Header *h)
{
/* restore idle timeout */
mdev->meta.socket->sk->sk_rcvtimeo = mdev->net_conf->ping_int*HZ;
@@ -3071,10 +3071,10 @@
return TRUE;
}
-STATIC int got_BlockAck(drbd_dev *mdev, Drbd_Header *h)
+int got_BlockAck(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- drbd_request_t *req;
- Drbd_BlockAck_Packet *p = (Drbd_BlockAck_Packet *)h;
+ struct drbd_request *req;
+ struct Drbd_BlockAck_Packet *p = (struct Drbd_BlockAck_Packet *)h;
sector_t sector = be64_to_cpu(p->sector);
int blksize = be32_to_cpu(p->blksize);
@@ -3123,11 +3123,11 @@
return TRUE;
}
-STATIC int got_NegAck(drbd_dev *mdev, Drbd_Header *h)
+int got_NegAck(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- Drbd_BlockAck_Packet *p = (Drbd_BlockAck_Packet *)h;
+ struct Drbd_BlockAck_Packet *p = (struct Drbd_BlockAck_Packet *)h;
sector_t sector = be64_to_cpu(p->sector);
- drbd_request_t *req;
+ struct drbd_request *req;
if (DRBD_ratelimit(5*HZ, 5))
WARN("Got NegAck packet. Peer is in troubles?\n");
@@ -3156,10 +3156,10 @@
return TRUE;
}
-STATIC int got_NegDReply(drbd_dev *mdev, Drbd_Header *h)
+int got_NegDReply(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- drbd_request_t *req;
- Drbd_BlockAck_Packet *p = (Drbd_BlockAck_Packet *)h;
+ struct drbd_request *req;
+ struct Drbd_BlockAck_Packet *p = (struct Drbd_BlockAck_Packet *)h;
sector_t sector = be64_to_cpu(p->sector);
spin_lock_irq(&mdev->req_lock);
@@ -3184,11 +3184,11 @@
return TRUE;
}
-STATIC int got_NegRSDReply(drbd_dev *mdev, Drbd_Header *h)
+int got_NegRSDReply(struct drbd_conf *mdev, struct Drbd_Header *h)
{
sector_t sector;
int size;
- Drbd_BlockAck_Packet *p = (Drbd_BlockAck_Packet *)h;
+ struct Drbd_BlockAck_Packet *p = (struct Drbd_BlockAck_Packet *)h;
sector = be64_to_cpu(p->sector);
size = be32_to_cpu(p->blksize);
@@ -3205,9 +3205,9 @@
return TRUE;
}
-STATIC int got_BarrierAck(drbd_dev *mdev, Drbd_Header *h)
+int got_BarrierAck(struct drbd_conf *mdev, struct Drbd_Header *h)
{
- Drbd_BarrierAck_Packet *p = (Drbd_BarrierAck_Packet *)h;
+ struct Drbd_BarrierAck_Packet *p = (struct Drbd_BarrierAck_Packet *)h;
tl_release(mdev, p->barrier, be32_to_cpu(p->set_size));
dec_ap_pending(mdev);
@@ -3217,33 +3217,33 @@
struct asender_cmd {
size_t pkt_size;
- int (*process)(drbd_dev *mdev, Drbd_Header *h);
+ int (*process)(struct drbd_conf *mdev, struct Drbd_Header *h);
};
int drbd_asender(struct Drbd_thread *thi)
{
- drbd_dev *mdev = thi->mdev;
- Drbd_Header *h = &mdev->meta.rbuf.head;
+ struct drbd_conf *mdev = thi->mdev;
+ struct Drbd_Header *h = &mdev->meta.rbuf.head;
int rv, len;
void *buf = h;
int received = 0;
- int expect = sizeof(Drbd_Header);
+ int expect = sizeof(struct Drbd_Header);
int cmd = -1;
int empty;
static struct asender_cmd asender_tbl[] = {
- [Ping] = { sizeof(Drbd_Header), got_Ping },
- [PingAck] = { sizeof(Drbd_Header), got_PingAck },
- [RecvAck] = { sizeof(Drbd_BlockAck_Packet), got_BlockAck },
- [WriteAck] = { sizeof(Drbd_BlockAck_Packet), got_BlockAck },
- [RSWriteAck] = { sizeof(Drbd_BlockAck_Packet), got_BlockAck },
- [DiscardAck] = { sizeof(Drbd_BlockAck_Packet), got_BlockAck },
- [NegAck] = { sizeof(Drbd_BlockAck_Packet), got_NegAck },
- [NegDReply] = { sizeof(Drbd_BlockAck_Packet), got_NegDReply },
- [NegRSDReply] = { sizeof(Drbd_BlockAck_Packet), got_NegRSDReply},
- [BarrierAck] = { sizeof(Drbd_BarrierAck_Packet), got_BarrierAck },
- [StateChgReply] = { sizeof(Drbd_RqS_Reply_Packet), got_RqSReply },
+ [Ping] = { sizeof(struct Drbd_Header), got_Ping },
+ [PingAck] = { sizeof(struct Drbd_Header), got_PingAck },
+ [RecvAck] = { sizeof(struct Drbd_BlockAck_Packet), got_BlockAck },
+ [WriteAck] = { sizeof(struct Drbd_BlockAck_Packet), got_BlockAck },
+ [RSWriteAck] = { sizeof(struct Drbd_BlockAck_Packet), got_BlockAck },
+ [DiscardAck] = { sizeof(struct Drbd_BlockAck_Packet), got_BlockAck },
+ [NegAck] = { sizeof(struct Drbd_BlockAck_Packet), got_NegAck },
+ [NegDReply] = { sizeof(struct Drbd_BlockAck_Packet), got_NegDReply },
+ [NegRSDReply] = { sizeof(struct Drbd_BlockAck_Packet), got_NegRSDReply},
+ [BarrierAck] = { sizeof(struct Drbd_BarrierAck_Packet), got_BarrierAck },
+ [StateChgReply] = { sizeof(struct Drbd_RqS_Reply_Packet), got_RqSReply },
};
sprintf(current->comm, "drbd%d_asender", mdev_to_minor(mdev));
@@ -3322,7 +3322,7 @@
goto err;
}
expect = asender_tbl[cmd].pkt_size;
- ERR_IF(len != expect-sizeof(Drbd_Header)) {
+ ERR_IF(len != expect-sizeof(struct Drbd_Header)) {
dump_packet(mdev, mdev->meta.socket, 1, (void *)h, __FILE__, __LINE__);
DUMPI(expect);
}
@@ -3334,7 +3334,7 @@
buf = h;
received = 0;
- expect = sizeof(Drbd_Header);
+ expect = sizeof(struct Drbd_Header);
cmd = -1;
}
}
Modified: branches/drbd-8.0-for-linus/drbd/drbd_req.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_req.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_req.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -35,10 +35,10 @@
/* outside of the ifdef
* because of the _print_rq_state(,FIXME) in barrier_acked */
-void _print_rq_state(drbd_request_t *req, const char *txt)
+void _print_rq_state(struct drbd_request *req, const char *txt)
{
const unsigned long s = req->rq_state;
- drbd_dev *mdev = req->mdev;
+ struct drbd_conf *mdev = req->mdev;
const int rw = (req->master_bio == NULL ||
bio_data_dir(req->master_bio) == WRITE) ?
'W' : 'R';
@@ -61,9 +61,9 @@
/* #define VERBOSE_REQUEST_CODE */
#if defined(VERBOSE_REQUEST_CODE) || defined(ENABLE_DYNAMIC_TRACE)
-void _print_req_mod(drbd_request_t *req, drbd_req_event_t what)
+void _print_req_mod(struct drbd_request *req, enum drbd_req_event what)
{
- drbd_dev *mdev = req->mdev;
+ struct drbd_conf *mdev = req->mdev;
const int rw = (req->master_bio == NULL ||
bio_data_dir(req->master_bio) == WRITE) ?
'W' : 'R';
@@ -105,7 +105,7 @@
#define print_req_mod(T, W)
#endif
-static void _req_is_done(drbd_dev *mdev, drbd_request_t *req, const int rw)
+static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const int rw)
{
const unsigned long s = req->rq_state;
/* if it was a write, we may have to set the corresponding
@@ -179,10 +179,10 @@
}
}
-static void _about_to_complete_local_write(drbd_dev *mdev, drbd_request_t *req)
+static void _about_to_complete_local_write(struct drbd_conf *mdev, struct drbd_request *req)
{
const unsigned long s = req->rq_state;
- drbd_request_t *i;
+ struct drbd_request *i;
struct Tl_epoch_entry *e;
struct hlist_node *n;
struct hlist_head *slot;
@@ -237,7 +237,7 @@
#undef OVERLAPS
}
-static void _complete_master_bio(drbd_dev *mdev, drbd_request_t *req, int error)
+static void _complete_master_bio(struct drbd_conf *mdev, struct drbd_request *req, int error)
{
dump_bio(mdev, req->master_bio, 1);
bio_endio(req->master_bio, req->master_bio->bi_size, error);
@@ -245,10 +245,10 @@
dec_ap_bio(mdev);
}
-void _req_may_be_done(drbd_request_t *req, int error)
+void _req_may_be_done(struct drbd_request *req, int error)
{
const unsigned long s = req->rq_state;
- drbd_dev *mdev = req->mdev;
+ struct drbd_conf *mdev = req->mdev;
int rw;
print_rq_state(req, "_req_may_be_done");
@@ -350,12 +350,12 @@
* second hlist_for_each_entry becomes a noop. This is even simpler than to
* grab a reference on the net_conf, and check for the two_primaries flag...
*/
-STATIC int _req_conflicts(drbd_request_t *req)
+int _req_conflicts(struct drbd_request *req)
{
- drbd_dev *mdev = req->mdev;
+ struct drbd_conf *mdev = req->mdev;
const sector_t sector = req->sector;
const int size = req->size;
- drbd_request_t *i;
+ struct drbd_request *i;
struct Tl_epoch_entry *e;
struct hlist_node *n;
struct hlist_head *slot;
@@ -431,9 +431,9 @@
* Though I think it is likely that we break this again into many
* static inline void _req_mod_ ## what (req) ...
*/
-void _req_mod(drbd_request_t *req, drbd_req_event_t what, int error)
+void _req_mod(struct drbd_request *req, enum drbd_req_event what, int error)
{
- drbd_dev *mdev = req->mdev;
+ struct drbd_conf *mdev = req->mdev;
MUST_HOLD(&mdev->req_lock);
if (error && (bio_rw(req->master_bio) != READA))
@@ -716,7 +716,7 @@
* since size may be bigger than BM_BLOCK_SIZE,
* we may need to check several bits.
*/
-STATIC int drbd_may_do_local_read(drbd_dev *mdev, sector_t sector, int size)
+int drbd_may_do_local_read(struct drbd_conf *mdev, sector_t sector, int size)
{
unsigned long sbnr, ebnr, bnr;
sector_t esector, nr_sectors;
@@ -758,12 +758,12 @@
* anyways, and then see that it does not work there and then.
*/
-STATIC int
-drbd_make_request_common(drbd_dev *mdev, int rw, int size,
+int
+drbd_make_request_common(struct drbd_conf *mdev, int rw, int size,
sector_t sector, struct bio *bio)
{
struct drbd_barrier *b = NULL;
- drbd_request_t *req;
+ struct drbd_request *req;
int local, remote;
int err = -EIO;
@@ -1020,7 +1020,7 @@
* return 1
* otherwise return 0
*/
-static int drbd_fail_request_early(drbd_dev *mdev, int is_write)
+static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write)
{
/* Unconfigured */
if (mdev->state.conn == Disconnecting &&
@@ -1061,7 +1061,7 @@
int drbd_make_request_26(request_queue_t *q, struct bio *bio)
{
unsigned int s_enr, e_enr;
- struct Drbd_Conf *mdev = (drbd_dev *) q->queuedata;
+ struct drbd_conf *mdev = (struct drbd_conf *) q->queuedata;
if (drbd_fail_request_early(mdev, bio_data_dir(bio) & WRITE)) {
bio_endio(bio, bio->bi_size, -EPERM);
@@ -1137,7 +1137,7 @@
* we should use DRBD_MAX_SEGMENT_SIZE instead of AL_EXTENT_SIZE */
int drbd_merge_bvec(request_queue_t *q, struct bio *bio, struct bio_vec *bvec)
{
- struct Drbd_Conf *mdev = (drbd_dev *) q->queuedata;
+ struct drbd_conf *mdev = (struct drbd_conf *) q->queuedata;
unsigned int bio_offset = (unsigned int)bio->bi_sector << 9; /* 32 bit */
unsigned int bio_size = bio->bi_size;
int limit, backing_limit;
Modified: branches/drbd-8.0-for-linus/drbd/drbd_req.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_req.h 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_req.h 2007-07-24 14:15:33 UTC (rev 2996)
@@ -39,7 +39,7 @@
Try to get the locking right :) */
/*
- * Objects of type drbd_request_t do only exist on a Primary node, and are
+ * Objects of type struct drbd_request do only exist on a Primary node, and are
* associated with IO requests originating from the block layer above us.
*
* There are quite a few things that may happen to a drbd request
@@ -84,7 +84,7 @@
* (dot -Tps2 documentation/drbd-request-state-overview.dot | display -)
*/
-typedef enum {
+enum drbd_req_event {
created,
to_be_send,
to_be_submitted,
@@ -110,7 +110,7 @@
read_completed_with_error,
write_completed_with_error,
completed_ok,
-} drbd_req_event_t;
+};
/* encoding of request states for now. we don't actually need that many bits.
* we don't need to do atomic bit operations either, since most of the time we
@@ -207,14 +207,14 @@
#define RQ_NET_MASK (((1UL << __RQ_NET_MAX)-1) & ~RQ_LOCAL_MASK) /* 0x1f8 */
/* epoch entries */
-static inline struct hlist_head *ee_hash_slot(drbd_dev *mdev, sector_t sector)
+static inline struct hlist_head *ee_hash_slot(struct drbd_conf *mdev, sector_t sector)
{
BUG_ON(mdev->ee_hash_s == 0);
return mdev->ee_hash + ((unsigned int)(sector>>HT_SHIFT) % mdev->ee_hash_s);
}
/* transfer log (drbd_request objects) */
-static inline struct hlist_head *tl_hash_slot(drbd_dev *mdev, sector_t sector)
+static inline struct hlist_head *tl_hash_slot(struct drbd_conf *mdev, sector_t sector)
{
BUG_ON(mdev->tl_hash_s == 0);
return mdev->tl_hash +
@@ -223,11 +223,11 @@
/* when we receive the answer for a read request,
* verify that we actually know about it */
-static inline drbd_request_t *_ack_id_to_req(drbd_dev *mdev, u64 id, sector_t sector)
+static inline struct drbd_request *_ack_id_to_req(struct drbd_conf *mdev, u64 id, sector_t sector)
{
struct hlist_head *slot = tl_hash_slot(mdev, sector);
struct hlist_node *n;
- drbd_request_t *req;
+ struct drbd_request *req;
hlist_for_each_entry(req, n, slot, colision) {
if ((unsigned long)req == (unsigned long)id) {
@@ -247,7 +247,7 @@
}
/* application reads (drbd_request objects) */
-static struct hlist_head *ar_hash_slot(drbd_dev *mdev, sector_t sector)
+static struct hlist_head *ar_hash_slot(struct drbd_conf *mdev, sector_t sector)
{
return mdev->app_reads_hash
+ ((unsigned int)(sector) % APP_R_HSIZE);
@@ -255,11 +255,11 @@
/* when we receive the answer for a read request,
* verify that we actually know about it */
-static inline drbd_request_t *_ar_id_to_req(drbd_dev *mdev, u64 id, sector_t sector)
+static inline struct drbd_request *_ar_id_to_req(struct drbd_conf *mdev, u64 id, sector_t sector)
{
struct hlist_head *slot = ar_hash_slot(mdev, sector);
struct hlist_node *n;
- drbd_request_t *req;
+ struct drbd_request *req;
hlist_for_each_entry(req, n, slot, colision) {
if ((unsigned long)req == (unsigned long)id) {
@@ -270,10 +270,10 @@
return NULL;
}
-static inline drbd_request_t *drbd_req_new(drbd_dev *mdev, struct bio *bio_src)
+static inline struct drbd_request *drbd_req_new(struct drbd_conf *mdev, struct bio *bio_src)
{
struct bio *bio;
- drbd_request_t *req = mempool_alloc(drbd_request_mempool, GFP_NOIO);
+ struct drbd_request *req = mempool_alloc(drbd_request_mempool, GFP_NOIO);
if (likely(req)) {
bio = bio_clone(bio_src, GFP_NOIO); /* XXX cannot fail?? */
@@ -294,7 +294,7 @@
return req;
}
-static inline void drbd_req_free(drbd_request_t *req)
+static inline void drbd_req_free(struct drbd_request *req)
{
mempool_free(req, drbd_request_mempool);
}
@@ -306,13 +306,13 @@
/* aparently too large to be inlined...
* moved to drbd_req.c */
-extern void _req_may_be_done(drbd_request_t *req, int error);
-extern void _req_mod(drbd_request_t *req, drbd_req_event_t what, int error);
+extern void _req_may_be_done(struct drbd_request *req, int error);
+extern void _req_mod(struct drbd_request *req, enum drbd_req_event what, int error);
/* If you need it irqsave, do it your self! */
-static inline void req_mod(drbd_request_t *req, drbd_req_event_t what, int error)
+static inline void req_mod(struct drbd_request *req, enum drbd_req_event what, int error)
{
- drbd_dev *mdev = req->mdev;
+ struct drbd_conf *mdev = req->mdev;
spin_lock_irq(&mdev->req_lock);
_req_mod(req, what, error);
spin_unlock_irq(&mdev->req_lock);
Modified: branches/drbd-8.0-for-linus/drbd/drbd_strings.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_strings.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_strings.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -83,23 +83,23 @@
[-SS_DeviceInUse] = "Device is held open by someone"
};
-const char *conns_to_name(drbd_conns_t s)
+const char *conns_to_name(enum drbd_conns s)
{
/* enums are unsigned... */
return s > PausedSyncT ? "TOO_LARGE" : drbd_conn_s_names[s];
}
-const char *roles_to_name(drbd_role_t s)
+const char *roles_to_name(enum drbd_role s)
{
return s > Secondary ? "TOO_LARGE" : drbd_role_s_names[s];
}
-const char *disks_to_name(drbd_disks_t s)
+const char *disks_to_name(enum drbd_disk_state s)
{
return s > UpToDate ? "TOO_LARGE" : drbd_disk_s_names[s];
}
-const char *set_st_err_name(set_st_err_t err)
+const char *set_st_err_name(enum set_st_err err)
{
return err < SS_DeviceInUse ? "TOO_SMALL" :
err > SS_TwoPrimaries ? "TOO_LARGE"
Modified: branches/drbd-8.0-for-linus/drbd/drbd_worker.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_worker.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_worker.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -79,7 +79,7 @@
{
unsigned long flags = 0;
struct Tl_epoch_entry *e = NULL;
- struct Drbd_Conf *mdev;
+ struct drbd_conf *mdev;
int uptodate = bio_flagged(bio, BIO_UPTODATE);
e = bio->bi_private;
@@ -123,7 +123,7 @@
{
unsigned long flags = 0;
struct Tl_epoch_entry *e = NULL;
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
sector_t e_sector;
int do_wake;
int is_syncer_req;
@@ -195,9 +195,9 @@
int drbd_endio_pri(struct bio *bio, unsigned int bytes_done, int error)
{
unsigned long flags;
- drbd_request_t *req = bio->bi_private;
- drbd_dev *mdev = req->mdev;
- drbd_req_event_t what;
+ struct drbd_request *req = bio->bi_private;
+ struct drbd_conf *mdev = req->mdev;
+ enum drbd_req_event what;
int uptodate = bio_flagged(bio, BIO_UPTODATE);
/* see above */
@@ -222,9 +222,9 @@
return 0;
}
-int w_io_error(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_io_error(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
- drbd_request_t *req = (drbd_request_t *)w;
+ struct drbd_request *req = (struct drbd_request *)w;
int ok;
/* FIXME send a "set_out_of_sync" packet to the peer
@@ -247,9 +247,9 @@
return ok;
}
-int w_read_retry_remote(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_read_retry_remote(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
- drbd_request_t *req = (drbd_request_t *)w;
+ struct drbd_request *req = (struct drbd_request *)w;
spin_lock_irq(&mdev->req_lock);
if ( cancel ||
@@ -270,7 +270,7 @@
return w_send_read_req(mdev, w, 0);
}
-int w_resync_inactive(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_resync_inactive(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
ERR_IF(cancel) return 1;
ERR("resync inactive, but callback triggered??\n");
@@ -280,7 +280,7 @@
void resync_timer_fn(unsigned long data)
{
unsigned long flags;
- drbd_dev *mdev = (drbd_dev *) data;
+ struct drbd_conf *mdev = (struct drbd_conf *) data;
int queue;
spin_lock_irqsave(&mdev->req_lock, flags);
@@ -302,7 +302,7 @@
#define SLEEP_TIME (HZ/10)
-int w_make_resync_request(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_make_resync_request(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
unsigned long bit;
sector_t sector;
@@ -441,7 +441,7 @@
return 1;
}
-int w_resync_finished(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_resync_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
kfree(w);
@@ -452,7 +452,7 @@
return 1;
}
-int drbd_resync_finished(drbd_dev *mdev)
+int drbd_resync_finished(struct drbd_conf *mdev)
{
unsigned long db, dt, dbdt;
int dstate, pdstate;
@@ -550,7 +550,7 @@
/**
* w_e_end_data_req: Send the answer (DataReply) in response to a DataRequest.
*/
-int w_e_end_data_req(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_e_end_data_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
int ok;
@@ -594,7 +594,7 @@
/**
* w_e_end_rsdata_req: Send the answer (RSDataReply) to a RSDataRequest.
*/
-int w_e_end_rsdata_req(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_e_end_rsdata_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
int ok;
@@ -647,17 +647,17 @@
return ok;
}
-int w_prev_work_done(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_prev_work_done(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
clear_bit(WORK_PENDING, &mdev->flags);
wake_up(&mdev->misc_wait);
return 1;
}
-int w_send_barrier(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_send_barrier(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
struct drbd_barrier *b = (struct drbd_barrier *)w;
- Drbd_Barrier_Packet *p = &mdev->data.sbuf.Barrier;
+ struct Drbd_Barrier_Packet *p = &mdev->data.sbuf.Barrier;
int ok = 1;
/* really avoid racing with tl_clear. w.cb may have been referenced
@@ -678,13 +678,13 @@
/* inc_ap_pending was done where this was queued.
* dec_ap_pending will be done in got_BarrierAck
* or (on connection loss) in w_clear_epoch. */
- ok = _drbd_send_cmd(mdev, mdev->data.socket, Barrier, (Drbd_Header *)p, sizeof(*p), 0);
+ ok = _drbd_send_cmd(mdev, mdev->data.socket, Barrier, (struct Drbd_Header *)p, sizeof(*p), 0);
drbd_put_data_sock(mdev);
return ok;
}
-int w_send_write_hint(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_send_write_hint(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
if (cancel) return 1;
return drbd_send_short_cmd(mdev, UnplugRemote);
@@ -693,9 +693,9 @@
/**
* w_send_dblock: Send a mirrored write request.
*/
-int w_send_dblock(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_send_dblock(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
- drbd_request_t *req = (drbd_request_t *)w;
+ struct drbd_request *req = (struct drbd_request *)w;
int ok;
if (unlikely(cancel)) {
@@ -712,9 +712,9 @@
/**
* w_send_read_req: Send a read requests.
*/
-int w_send_read_req(drbd_dev *mdev, struct drbd_work *w, int cancel)
+int w_send_read_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
{
- drbd_request_t *req = (drbd_request_t *)w;
+ struct drbd_request *req = (struct drbd_request *)w;
int ok;
if (unlikely(cancel)) {
@@ -740,9 +740,9 @@
return ok;
}
-STATIC void drbd_global_lock(void)
+void drbd_global_lock(void)
{
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
int i;
local_irq_disable();
@@ -754,9 +754,9 @@
}
}
-STATIC void drbd_global_unlock(void)
+void drbd_global_unlock(void)
{
- drbd_dev *mdev;
+ struct drbd_conf *mdev;
int i;
for (i = 0; i < minor_count; i++) {
@@ -768,9 +768,9 @@
local_irq_enable();
}
-STATIC int _drbd_may_sync_now(drbd_dev *mdev)
+int _drbd_may_sync_now(struct drbd_conf *mdev)
{
- drbd_dev *odev = mdev;
+ struct drbd_conf *odev = mdev;
while (1) {
if (odev->sync_conf.after == -1) return 1;
@@ -789,9 +789,9 @@
* pause their resynchronisation.
* Called from process context only ( ioctl and after_state_ch ).
*/
-STATIC int _drbd_pause_after(drbd_dev *mdev)
+int _drbd_pause_after(struct drbd_conf *mdev)
{
- drbd_dev *odev;
+ struct drbd_conf *odev;
int i, rv = 0;
for (i = 0; i < minor_count; i++) {
@@ -812,9 +812,9 @@
* process, and causes them to resume.
* Called from process context only ( ioctl and worker ).
*/
-STATIC int _drbd_resume_next(drbd_dev *mdev)
+int _drbd_resume_next(struct drbd_conf *mdev)
{
- drbd_dev *odev;
+ struct drbd_conf *odev;
int i, rv = 0;
for (i = 0; i < minor_count; i++) {
@@ -831,21 +831,21 @@
return rv;
}
-void resume_next_sg(drbd_dev *mdev)
+void resume_next_sg(struct drbd_conf *mdev)
{
drbd_global_lock();
_drbd_resume_next(mdev);
drbd_global_unlock();
}
-void suspend_other_sg(drbd_dev *mdev)
+void suspend_other_sg(struct drbd_conf *mdev)
{
drbd_global_lock();
_drbd_pause_after(mdev);
drbd_global_unlock();
}
-void drbd_alter_sa(drbd_dev *mdev, int na)
+void drbd_alter_sa(struct drbd_conf *mdev, int na)
{
int changes;
@@ -868,9 +868,9 @@
* Note, this function might bring you directly into one of the
* PausedSync* states.
*/
-void drbd_start_resync(drbd_dev *mdev, drbd_conns_t side)
+void drbd_start_resync(struct drbd_conf *mdev, enum drbd_conns side)
{
- drbd_state_t os, ns;
+ union drbd_state_t os, ns;
int r = 0;
MTRACE(TraceTypeResync, TraceLvlSummary,
@@ -945,7 +945,7 @@
int drbd_worker(struct Drbd_thread *thi)
{
- drbd_dev *mdev = thi->mdev;
+ struct drbd_conf *mdev = thi->mdev;
struct drbd_work *w = 0;
LIST_HEAD(work_list);
int intr = 0, i;
Modified: branches/drbd-8.0-for-linus/drbd/drbd_wrappers.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_wrappers.h 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/drbd_wrappers.h 2007-07-24 14:15:33 UTC (rev 2996)
@@ -36,7 +36,7 @@
}
/* sets the number of 512 byte sectors of our virtual device */
-static inline void drbd_set_my_capacity(drbd_dev *mdev,
+static inline void drbd_set_my_capacity(struct drbd_conf *mdev,
sector_t size)
{
/* set_capacity(mdev->this_bdev->bd_disk, size); */
@@ -108,7 +108,7 @@
/*
* used to submit our private bio
*/
-static inline void drbd_generic_make_request(drbd_dev *mdev, int rw, int fault_type, struct bio *bio)
+static inline void drbd_generic_make_request(struct drbd_conf *mdev, int rw, int fault_type, struct bio *bio)
{
bio->bi_rw = rw; /* on the receiver side, e->..rw was not yet defined. */
@@ -126,7 +126,7 @@
generic_make_request(bio);
}
-static inline void drbd_plug_device(drbd_dev *mdev)
+static inline void drbd_plug_device(struct drbd_conf *mdev)
{
request_queue_t *q;
q = bdev_get_queue(mdev->this_bdev);
@@ -144,7 +144,7 @@
spin_unlock_irq(q->queue_lock);
}
-static inline int _drbd_send_bio(drbd_dev *mdev, struct bio *bio)
+static inline int _drbd_send_bio(struct drbd_conf *mdev, struct bio *bio)
{
struct bio_vec *bvec = bio_iovec(bio);
struct page *page = bvec->bv_page;
Modified: branches/drbd-8.0-for-linus/drbd/linux/drbd.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/linux/drbd.h 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/linux/drbd.h 2007-07-24 14:15:33 UTC (rev 2996)
@@ -121,12 +121,12 @@
#define DRBD_PROT_B 2
#define DRBD_PROT_C 3
-typedef enum {
+enum drbd_role {
Unknown = 0,
Primary = 1, /* role */
Secondary = 2, /* role */
role_mask = 3,
-} drbd_role_t;
+};
/* The order of these constants is important.
* The lower ones (<WFReportParams) indicate
@@ -137,7 +137,7 @@
* Skipped should be < Connected,
* so writes on a Primary after Skipped sync are not mirrored either ?
*/
-typedef enum {
+enum drbd_conns {
StandAlone,
Disconnecting, /* Temporal state on the way to StandAlone. */
Unconnected, /* >= Unconnected -> inc_net() succeeds */
@@ -170,9 +170,9 @@
PausedSyncS,
PausedSyncT,
conn_mask = 31
-} drbd_conns_t;
+};
-typedef enum {
+enum drbd_disk_state {
Diskless,
Attaching, /* In the process of reading the meta-data */
Failed, /* Becomes Diskless as soon as we told it the peer */
@@ -184,9 +184,9 @@
Consistent, /* Might be Outdated, might be UpToDate ... */
UpToDate, /* Only this disk state allows applications' IO ! */
disk_mask = 15
-} drbd_disks_t;
+};
-typedef union {
+union drbd_state_t {
struct {
unsigned role : 2 ; /* 3/4 primary/secondary/unknown */
unsigned peer : 2 ; /* 3/4 primary/secondary/unknown */
@@ -200,9 +200,9 @@
unsigned _pad : 11; /* 0 unused */
};
unsigned int i;
-} drbd_state_t;
+};
-typedef enum {
+enum set_st_err {
SS_CW_NoNeed = 4,
SS_CW_Success = 3,
SS_NothingToDo = 2,
@@ -219,13 +219,13 @@
SS_CW_FailedByPeer = -10,
SS_IsDiskLess = -11,
SS_DeviceInUse = -12
-} set_st_err_t;
+};
/* from drbd_strings.c */
-extern const char *conns_to_name(drbd_conns_t);
-extern const char *roles_to_name(drbd_role_t);
-extern const char *disks_to_name(drbd_disks_t);
-extern const char *set_st_err_name(set_st_err_t);
+extern const char *conns_to_name(enum drbd_conns);
+extern const char *roles_to_name(enum drbd_role);
+extern const char *disks_to_name(enum drbd_disk_state);
+extern const char *set_st_err_name(enum set_st_err);
#ifndef BDEVNAME_SIZE
# define BDEVNAME_SIZE 32
Modified: branches/drbd-8.0-for-linus/drbd/lru_cache.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/lru_cache.c 2007-07-24 13:38:35 UTC (rev 2995)
+++ branches/drbd-8.0-for-linus/drbd/lru_cache.c 2007-07-24 14:15:33 UTC (rev 2996)
@@ -125,7 +125,7 @@
return NULL;
}
-STATIC struct lc_element *lc_evict(struct lru_cache *lc)
+struct lc_element *lc_evict(struct lru_cache *lc)
{
struct list_head *n;
struct lc_element *e;
@@ -160,7 +160,7 @@
RETURN();
}
-STATIC struct lc_element *lc_get_unused_element(struct lru_cache *lc)
+struct lc_element *lc_get_unused_element(struct lru_cache *lc)
{
struct list_head *n;
@@ -171,7 +171,7 @@
return list_entry(n, struct lc_element, list);
}
-STATIC int lc_unused_element_available(struct lru_cache *lc)
+int lc_unused_element_available(struct lru_cache *lc)
{
if (!list_empty(&lc->free)) return 1; /* something on the free list */
if (!list_empty(&lc->lru)) return 1; /* something to evict */
More information about the drbd-cvs
mailing list