[DRBD-cvs] svn commit by lars - r2991 - in
branches/drbd-8.0-for-linus/drbd: . linux -
10f7422a447552217cfde072c650c0f02c8ea602 fix pointer de
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Tue Jul 24 15:18:48 CEST 2007
Author: lars
Date: 2007-07-24 15:18:46 +0200 (Tue, 24 Jul 2007)
New Revision: 2991
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/linux/drbd_tag_magic.h
branches/drbd-8.0-for-linus/drbd/lru_cache.c
branches/drbd-8.0-for-linus/drbd/lru_cache.h
Log:
10f7422a447552217cfde072c650c0f02c8ea602 fix pointer declarations/casts foo* ==> foo *
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_actlog.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -175,7 +175,7 @@
struct update_al_work {
struct drbd_work w;
- struct lc_element * al_ext;
+ struct lc_element *al_ext;
struct completion event;
unsigned int enr;
};
@@ -183,14 +183,14 @@
STATIC 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;
unsigned long al_flags = 0;
spin_lock_irq(&mdev->al_lock);
- bm_ext = (struct bm_extent*) lc_find(mdev->resync, enr/AL_EXT_PER_BM_SECT);
+ bm_ext = (struct bm_extent *) lc_find(mdev->resync, enr/AL_EXT_PER_BM_SECT);
if (unlikely(bm_ext!=NULL)) {
if (test_bit(BME_NO_WRITES, &bm_ext->flags)) {
spin_unlock_irq(&mdev->al_lock);
@@ -299,15 +299,15 @@
{
int i, n, mx;
unsigned int extent_nr;
- struct al_transaction* buffer;
+ struct al_transaction *buffer;
sector_t sector;
u32 xor_sum = 0;
- struct lc_element *updated = ((struct update_al_work*)w)->al_ext;
- unsigned int new_enr = ((struct update_al_work*)w)->enr;
+ struct lc_element *updated = ((struct update_al_work *)w)->al_ext;
+ unsigned int new_enr = ((struct update_al_work *)w)->enr;
down(&mdev->md_io_mutex); /* protects md_io_buffer, al_tr_cycle, ... */
- buffer = (struct al_transaction*)page_address(mdev->md_io_page);
+ buffer = (struct al_transaction *)page_address(mdev->md_io_page);
buffer->magic = __constant_cpu_to_be32(DRBD_MAGIC);
buffer->tr_number = cpu_to_be32(mdev->al_tr_number);
@@ -357,7 +357,7 @@
up(&mdev->md_io_mutex);
- complete(&((struct update_al_work*)w)->event);
+ complete(&((struct update_al_work *)w)->event);
return 1;
}
@@ -370,7 +370,7 @@
*/
STATIC int drbd_al_read_tr(struct Drbd_Conf *mdev,
struct drbd_backing_dev *bdev,
- struct al_transaction* b,
+ struct al_transaction *b,
int index)
{
sector_t sector;
@@ -400,7 +400,7 @@
*/
int drbd_al_read_log(struct Drbd_Conf *mdev, struct drbd_backing_dev *bdev)
{
- struct al_transaction* buffer;
+ struct al_transaction *buffer;
int from = -1, to = -1, i, cnr, overflow = 0, rv;
u32 from_tnr = -1, to_tnr = 0;
int active_extents = 0;
@@ -627,7 +627,7 @@
nr_elements = mdev->act_log->nr_elements;
- bios = kzalloc(sizeof(struct bio*) * nr_elements, GFP_KERNEL);
+ bios = kzalloc(sizeof(struct bio *) * nr_elements, GFP_KERNEL);
if (!bios) goto submit_one_by_one;
atomic_set(&wc.count, 0);
@@ -766,7 +766,7 @@
STATIC int w_update_odbm(drbd_dev *mdev, struct drbd_work *w, int unused)
{
- struct update_odbm_work *udw = (struct update_odbm_work*)w;
+ struct update_odbm_work *udw = (struct update_odbm_work *)w;
if ( !inc_local_if_state(mdev, Attaching) ) {
if (DRBD_ratelimit(5*HZ, 5))
@@ -801,8 +801,8 @@
STATIC void drbd_try_clear_on_disk_bm(struct Drbd_Conf *mdev, sector_t sector,
int count, int success)
{
- struct bm_extent* ext;
- struct update_odbm_work * udw;
+ struct bm_extent *ext;
+ struct update_odbm_work *udw;
unsigned int enr;
@@ -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(drbd_dev *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(drbd_dev *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;
@@ -1026,12 +1026,12 @@
spin_unlock_irq(&mdev->al_lock);
return NULL;
}
- bm_ext = (struct bm_extent*) lc_get(mdev->resync, enr);
+ bm_ext = (struct bm_extent *) lc_get(mdev->resync, enr);
if (bm_ext) {
if (bm_ext->lce.lc_number != enr) {
bm_ext->rs_left = drbd_bm_e_weight(mdev, enr);
bm_ext->rs_failed = 0;
- lc_changed(mdev->resync, (struct lc_element*)bm_ext);
+ lc_changed(mdev->resync, (struct lc_element *)bm_ext);
wakeup = 1;
}
if (bm_ext->lce.refcnt == 1) mdev->resync_locked++;
@@ -1053,7 +1053,7 @@
static inline int _is_in_al(drbd_dev* mdev, unsigned int enr)
{
- struct lc_element* al_ext;
+ struct lc_element *al_ext;
int rv = 0;
spin_lock_irq(&mdev->al_lock);
@@ -1087,7 +1087,7 @@
int drbd_rs_begin_io(drbd_dev* mdev, sector_t sector)
{
unsigned int enr = BM_SECT_TO_EXT(sector);
- struct bm_extent* bm_ext;
+ struct bm_extent *bm_ext;
int i, sig;
MTRACE(TraceTypeResync, TraceLvlAll,
@@ -1135,7 +1135,7 @@
{
unsigned int enr = BM_SECT_TO_EXT(sector);
const unsigned int al_enr = enr*AL_EXT_PER_BM_SECT;
- struct bm_extent* bm_ext;
+ struct bm_extent *bm_ext;
int i;
MTRACE(TraceTypeResync, TraceLvlAll,
@@ -1162,7 +1162,7 @@
INFO("dropping %u, aparently got 'synced' "
"by application io\n", mdev->resync_wenr);
);
- bm_ext = (struct bm_extent*)lc_find(mdev->resync, mdev->resync_wenr);
+ bm_ext = (struct bm_extent *)lc_find(mdev->resync, mdev->resync_wenr);
if (bm_ext) {
D_ASSERT(!test_bit(BME_LOCKED, &bm_ext->flags));
D_ASSERT(test_bit(BME_NO_WRITES, &bm_ext->flags));
@@ -1174,7 +1174,7 @@
ALERT("LOGIC BUG\n");
}
}
- bm_ext = (struct bm_extent*)lc_try_get(mdev->resync, enr);
+ bm_ext = (struct bm_extent *)lc_try_get(mdev->resync, enr);
if (bm_ext) {
if (test_bit(BME_LOCKED, &bm_ext->flags))
goto proceed;
@@ -1195,7 +1195,7 @@
} else {
if (mdev->resync_locked > mdev->resync->nr_elements-3)
goto try_again;
- bm_ext = (struct bm_extent*)lc_get(mdev->resync, enr);
+ bm_ext = (struct bm_extent *)lc_get(mdev->resync, enr);
if (!bm_ext) {
const unsigned long rs_flags = mdev->resync->flags;
if (rs_flags & LC_STARVING)
@@ -1207,7 +1207,7 @@
if (bm_ext->lce.lc_number != enr) {
bm_ext->rs_left = drbd_bm_e_weight(mdev, enr);
bm_ext->rs_failed = 0;
- lc_changed(mdev->resync, (struct lc_element*)bm_ext);
+ lc_changed(mdev->resync, (struct lc_element *)bm_ext);
wake_up(&mdev->al_wait);
D_ASSERT(test_bit(BME_LOCKED, &bm_ext->flags) == 0);
}
@@ -1244,7 +1244,7 @@
void drbd_rs_complete_io(drbd_dev* mdev, sector_t sector)
{
unsigned int enr = BM_SECT_TO_EXT(sector);
- struct bm_extent* bm_ext;
+ struct bm_extent *bm_ext;
unsigned long flags;
MTRACE(TraceTypeResync, TraceLvlAll,
@@ -1253,7 +1253,7 @@
);
spin_lock_irqsave(&mdev->al_lock, flags);
- bm_ext = (struct bm_extent*) lc_find(mdev->resync, enr);
+ bm_ext = (struct bm_extent *) lc_find(mdev->resync, enr);
if (!bm_ext) {
spin_unlock_irqrestore(&mdev->al_lock, flags);
ERR("drbd_rs_complete_io() called, but extent not found\n");
@@ -1283,7 +1283,7 @@
*/
void drbd_rs_cancel_all(drbd_dev* mdev)
{
- struct bm_extent* bm_ext;
+ struct bm_extent *bm_ext;
int i;
MTRACE(TraceTypeResync, TraceLvlMetrics,
@@ -1295,7 +1295,7 @@
if (inc_local_if_state(mdev, Failed)) {
/* ok, ->resync is there. */
for(i = 0;i<mdev->resync->nr_elements;i++) {
- bm_ext = (struct bm_extent*) lc_entry(mdev->resync, i);
+ bm_ext = (struct bm_extent *) lc_entry(mdev->resync, i);
if (bm_ext->lce.lc_number == LC_FREE) continue;
bm_ext->lce.refcnt = 0; /* Rude but ok. */
bm_ext->rs_left = 0;
@@ -1320,7 +1320,7 @@
*/
int drbd_rs_del_all(drbd_dev* mdev)
{
- struct bm_extent* bm_ext;
+ struct bm_extent *bm_ext;
int i;
MTRACE(TraceTypeResync, TraceLvlMetrics,
@@ -1332,7 +1332,7 @@
if (inc_local_if_state(mdev, Failed)) {
/* ok, ->resync is there. */
for(i = 0;i<mdev->resync->nr_elements;i++) {
- bm_ext = (struct bm_extent*) lc_entry(mdev->resync, i);
+ bm_ext = (struct bm_extent *) lc_entry(mdev->resync, i);
if (bm_ext->lce.lc_number == LC_FREE) continue;
if (bm_ext->lce.lc_number == mdev->resync_wenr) {
INFO("dropping %u in drbd_rs_del_all, "
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_bitmap.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -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(drbd_dev *mdev, char *file, int line)
{
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)
+STATIC void bm_end_info(drbd_dev *mdev, const char *where)
{
struct drbd_bitmap *b = mdev->bitmap;
size_t w = (b->bm_bits-1) >> LN2_BPL;
@@ -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)
+STATIC 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)
+STATIC 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)
+STATIC 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;
@@ -271,7 +271,7 @@
return bits;
}
-void _drbd_bm_recount_bits(drbd_dev *mdev, char* file, int line)
+void _drbd_bm_recount_bits(drbd_dev *mdev, char *file, int line)
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long flags, bits;
@@ -430,7 +430,7 @@
* buffer[i] is expected to be little endian unsigned long.
*/
void drbd_bm_merge_lel( drbd_dev *mdev, size_t offset, size_t number,
- unsigned long* buffer )
+ unsigned long *buffer )
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long *bm;
@@ -468,7 +468,7 @@
* 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 )
+ unsigned long *buffer )
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long *bm;
@@ -506,7 +506,7 @@
* 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 )
+ unsigned long *buffer )
{
struct drbd_bitmap *b = mdev->bitmap;
unsigned long *bm;
@@ -581,7 +581,7 @@
/* we are process context. we always get a bio */
/* THINK: do we need GFP_NOIO here? */
struct bio *bio = bio_alloc(GFP_KERNEL, 1);
- struct page *page = vmalloc_to_page((char*)(b->bm) + (PAGE_SIZE*page_nr));
+ struct page *page = vmalloc_to_page((char *)(b->bm) + (PAGE_SIZE*page_nr));
unsigned int len;
sector_t on_disk_sector = mdev->bc->md.md_offset + mdev->bc->md.bm_offset;
on_disk_sector += ((sector_t)page_nr) << (PAGE_SHIFT-9);
@@ -1032,7 +1032,7 @@
e = min((size_t)S2W(enr+1), b->bm_words);
count = 0;
if (s < b->bm_words) {
- const unsigned long* w = b->bm+s;
+ const unsigned long *w = b->bm+s;
int n = e-s;
while (n--) count += hweight_long(*w++);
} else {
@@ -1061,7 +1061,7 @@
e = min_t(size_t, s + BM_WORDS_PER_AL_EXT, b->bm_words);
count = 0;
if (s < b->bm_words) {
- const unsigned long* w = b->bm+s;
+ const unsigned long *w = b->bm+s;
int n = e-s;
while (n--) count += hweight_long(*w++);
n = e-s;
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_int.h 2007-07-24 13:18:46 UTC (rev 2991)
@@ -316,7 +316,7 @@
HandShake = 0xfffe /* FIXED for the next century! */
} Drbd_Packet_Cmd;
-static inline const char* cmdname(Drbd_Packet_Cmd cmd)
+static inline const char *cmdname(Drbd_Packet_Cmd cmd)
{
/* THINK may need to become several global tables
* when we want to support more than
@@ -812,10 +812,10 @@
atomic_t local_cnt; /* Waiting for local disk to signal completion */
atomic_t net_cnt; /* Users of net_conf */
spinlock_t req_lock;
- struct drbd_barrier* unused_spare_barrier; /* for pre-allocation */
- struct drbd_barrier* newest_barrier;
- struct drbd_barrier* oldest_barrier;
- struct hlist_head * tl_hash;
+ struct drbd_barrier *unused_spare_barrier; /* for pre-allocation */
+ struct drbd_barrier *newest_barrier;
+ struct drbd_barrier *oldest_barrier;
+ struct hlist_head *tl_hash;
unsigned int tl_hash_s;
/* blocks to sync in this run [unit BM_BLOCK_SIZE] */
@@ -834,10 +834,10 @@
struct Drbd_thread receiver;
struct Drbd_thread worker;
struct Drbd_thread asender;
- struct drbd_bitmap* bitmap;
+ struct drbd_bitmap *bitmap;
/* Used to track operations of resync... */
- struct lru_cache* resync;
+ struct lru_cache *resync;
/* Number of locked elements in resync LRU */
unsigned int resync_locked;
/* resync extent number waiting for application requests */
@@ -869,11 +869,11 @@
struct semaphore md_io_mutex; /* protects the md_io_buffer */
spinlock_t al_lock;
wait_queue_head_t al_wait;
- struct lru_cache* act_log; /* activity log */
+ struct lru_cache *act_log; /* activity log */
unsigned int al_tr_number;
int al_tr_cycle;
int al_tr_pos; /* position of the next transaction in the journal */
- struct crypto_hash* cram_hmac_tfm;
+ struct crypto_hash *cram_hmac_tfm;
wait_queue_head_t seq_wait;
atomic_t packet_seq;
unsigned int peer_seq;
@@ -953,7 +953,7 @@
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,
- void* buf, size_t size, unsigned msg_flags);
+ 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);
@@ -967,7 +967,7 @@
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,
- char* data, size_t size);
+ 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,
u32 set_size);
@@ -988,13 +988,13 @@
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 void drbd_free_bc(struct drbd_backing_dev* bc);
+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);
/* 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 int drbd_md_read(drbd_dev *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);
@@ -1160,21 +1160,21 @@
extern int drbd_bm_rs_done(drbd_dev *mdev);
/* for receive_bitmap */
extern void drbd_bm_merge_lel (drbd_dev *mdev, size_t offset, size_t number,
- unsigned long* buffer);
+ 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,
- unsigned long* buffer);
+ 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,
unsigned long* buffer);
*/
-extern void __drbd_bm_lock (drbd_dev *mdev, char* file, int line);
+extern void __drbd_bm_lock (drbd_dev *mdev, char *file, int line);
extern void drbd_bm_unlock (drbd_dev *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(drbd_dev *mdev, char *file, int line);
#define drbd_bm_recount_bits(mdev) _drbd_bm_recount_bits(mdev, __FILE__, __LINE__ )
/* drbd_main.c */
@@ -1188,7 +1188,7 @@
extern mempool_t *drbd_request_mempool;
extern mempool_t *drbd_ee_mempool;
-extern struct page* drbd_pp_pool; /* drbd's page pool */
+extern struct page *drbd_pp_pool; /* drbd's page pool */
extern spinlock_t drbd_pp_lock;
extern int drbd_pp_vacant;
extern wait_queue_head_t drbd_pp_wait;
@@ -1272,11 +1272,11 @@
/* Packet dumping support */
extern void _dump_packet(drbd_dev *mdev, struct socket *sock,
- int recv, Drbd_Polymorph_Packet *p, char* file, int line);
+ int recv, 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)
+ int recv, Drbd_Polymorph_Packet *p, char *file, int line)
{
MTRACE(TraceTypePacket, TraceLvlSummary,
_dump_packet(mdev, sock, recv, p, file, line);
@@ -1300,7 +1300,7 @@
/* drbd_nl.c */
-extern char* ppsize(char* buf, unsigned long long size);
+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);
@@ -1309,7 +1309,7 @@
unsigned int cmd, unsigned long arg);
drbd_disks_t drbd_try_outdate_peer(drbd_dev *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(drbd_dev *mdev, char *cmd);
/* drbd_worker.c */
extern int drbd_worker(struct Drbd_thread *thi);
@@ -1339,13 +1339,13 @@
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(drbd_dev *mdev, struct list_head *list);
+extern struct Tl_epoch_entry *drbd_alloc_ee(drbd_dev *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_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);
@@ -1358,7 +1358,7 @@
int val = 1;
set_fs(KERNEL_DS);
- tcp_setsockopt(sock->sk, SOL_TCP, TCP_CORK, (char*)&val, sizeof(val) );
+ tcp_setsockopt(sock->sk, SOL_TCP, TCP_CORK, (char *)&val, sizeof(val) );
set_fs(oldfs);
#else
tcp_sk(sock->sk)->nonagle |= TCP_NAGLE_CORK;
@@ -1372,7 +1372,7 @@
int val = 0;
set_fs(KERNEL_DS);
- tcp_setsockopt(sock->sk, SOL_TCP, TCP_CORK, (char*)&val, sizeof(val) );
+ tcp_setsockopt(sock->sk, SOL_TCP, TCP_CORK, (char *)&val, sizeof(val) );
set_fs(oldfs);
#else
tcp_sk(sock->sk)->nonagle &= ~TCP_NAGLE_CORK;
@@ -1383,8 +1383,8 @@
/* 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(drbd_conns_t s);
+extern const char *roles_to_name(drbd_role_t s);
/* drbd_actlog.c */
extern void drbd_al_begin_io(struct Drbd_Conf *mdev, sector_t sector);
@@ -1396,10 +1396,10 @@
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_set_in_sync(drbd_dev *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(drbd_dev *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);
@@ -1498,7 +1498,7 @@
}
}
-static inline int semaphore_is_locked(struct semaphore* s)
+static inline int semaphore_is_locked(struct semaphore *s)
{
if (!down_trylock(s)) {
up(s);
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_main.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -63,9 +63,9 @@
enum chg_state_flags flags;
};
-int drbdd_init(struct Drbd_thread*);
-int drbd_worker(struct Drbd_thread*);
-int drbd_asender(struct Drbd_thread*);
+int drbdd_init(struct Drbd_thread *);
+int drbd_worker(struct Drbd_thread *);
+int drbd_asender(struct Drbd_thread *);
int drbd_init(void);
STATIC int drbd_open(struct inode *inode, struct file *file);
@@ -138,7 +138,7 @@
Note: This is a single linked list, the next pointer is the private
member of struct page.
*/
-struct page* drbd_pp_pool;
+struct page *drbd_pp_pool;
spinlock_t drbd_pp_lock;
int drbd_pp_vacant;
wait_queue_head_t drbd_pp_wait;
@@ -788,7 +788,7 @@
}
if (flags & ScheduleAfter) {
- struct after_state_chg_work* ascw;
+ struct after_state_chg_work *ascw;
ascw = kmalloc(sizeof(*ascw), GFP_ATOMIC);
if (ascw) {
@@ -807,9 +807,9 @@
STATIC int w_after_state_ch(drbd_dev *mdev, struct drbd_work *w, int unused)
{
- struct after_state_chg_work* ascw;
+ struct after_state_chg_work *ascw;
- ascw = (struct after_state_chg_work*) w;
+ ascw = (struct after_state_chg_work *) w;
after_state_ch(mdev, ascw->os, ascw->ns, ascw->flags);
kfree(ascw);
@@ -1035,7 +1035,7 @@
}
-STATIC int drbd_thread_setup(void* arg)
+STATIC int drbd_thread_setup(void *arg)
{
struct Drbd_thread *thi = (struct Drbd_thread *) arg;
drbd_dev *mdev = thi->mdev;
@@ -1185,7 +1185,7 @@
h->command = cpu_to_be16(cmd);
h->length = cpu_to_be16(size-sizeof(Drbd_Header));
- dump_packet(mdev, sock, 0, (void*)h, __FILE__, __LINE__);
+ dump_packet(mdev, sock, 0, (void *)h, __FILE__, __LINE__);
sent = drbd_send(mdev, sock, h, size, msg_flags);
ok = ( sent == size );
@@ -1224,7 +1224,7 @@
return ok;
}
-int drbd_send_cmd2(drbd_dev *mdev, Drbd_Packet_Cmd cmd, char* data,
+int drbd_send_cmd2(drbd_dev *mdev, Drbd_Packet_Cmd cmd, char *data,
size_t size)
{
Drbd_Header h;
@@ -1237,7 +1237,7 @@
if (!drbd_get_data_sock(mdev))
return 0;
- dump_packet(mdev, mdev->data.socket, 0, (void*)&h, __FILE__, __LINE__);
+ dump_packet(mdev, mdev->data.socket, 0, (void *)&h, __FILE__, __LINE__);
ok = ( sizeof(h) == drbd_send(mdev, mdev->data.socket, &h, sizeof(h), 0) );
ok = ok && ( size == drbd_send(mdev, mdev->data.socket, data, size, 0) );
@@ -1381,7 +1381,7 @@
bm_words = drbd_bm_words(mdev);
p = vmalloc(PAGE_SIZE); /* sleeps. cannot fail. */
- buffer = (unsigned long*)p->payload;
+ buffer = (unsigned long *)p->payload;
if (drbd_md_test_flag(mdev->bc, MDF_FullSync)) {
drbd_bm_set_all(mdev);
@@ -1673,7 +1673,7 @@
dp_flags |= DP_MAY_SET_IN_SYNC;
p.dp_flags = cpu_to_be32(dp_flags);
- dump_packet(mdev, mdev->data.socket, 0, (void*)&p, __FILE__, __LINE__);
+ dump_packet(mdev, mdev->data.socket, 0, (void *)&p, __FILE__, __LINE__);
set_bit(UNPLUG_REMOTE, &mdev->flags);
ok = sizeof(p) == drbd_send(mdev, mdev->data.socket, &p, sizeof(p), MSG_MORE);
if (ok) {
@@ -1712,7 +1712,7 @@
if (!drbd_get_data_sock(mdev))
return 0;
- dump_packet(mdev, mdev->data.socket, 0, (void*)&p, __FILE__, __LINE__);
+ dump_packet(mdev, mdev->data.socket, 0, (void *)&p, __FILE__, __LINE__);
ok = sizeof(p) == drbd_send(mdev, mdev->data.socket, &p, sizeof(p), MSG_MORE);
if (ok) ok = _drbd_send_zc_bio(mdev, e->private_bio);
@@ -1737,7 +1737,7 @@
* you must have down()ed the appropriate [m]sock_mutex elsewhere!
*/
int drbd_send(drbd_dev *mdev, struct socket *sock,
- void* buf, size_t size, unsigned msg_flags)
+ void *buf, size_t size, unsigned msg_flags)
{
#if !HAVE_KERNEL_SENDMSG
mm_segment_t oldfs;
@@ -2080,7 +2080,7 @@
while(drbd_pp_pool) {
page = drbd_pp_pool;
- drbd_pp_pool = (struct page*)page_private(page);
+ drbd_pp_pool = (struct page *)page_private(page);
__free_page(page);
drbd_pp_vacant--;
}
@@ -2314,7 +2314,7 @@
/* no need to lock access, we are still initializing the module. */
if (!tl_init(mdev)) goto Enomem;
- mdev->app_reads_hash = kzalloc(APP_R_HSIZE*sizeof(void*), GFP_KERNEL);
+ mdev->app_reads_hash = kzalloc(APP_R_HSIZE*sizeof(void *), GFP_KERNEL);
if (!mdev->app_reads_hash) goto Enomem;
return mdev;
@@ -2415,7 +2415,7 @@
return err;
}
-void drbd_free_bc(struct drbd_backing_dev* bc)
+void drbd_free_bc(struct drbd_backing_dev *bc)
{
if (bc == NULL) return;
@@ -2478,7 +2478,7 @@
*/
void drbd_md_sync(drbd_dev *mdev)
{
- struct meta_data_on_disk * buffer;
+ struct meta_data_on_disk *buffer;
sector_t sector;
int i;
@@ -2548,7 +2548,7 @@
*/
int drbd_md_read(drbd_dev *mdev, struct drbd_backing_dev *bdev)
{
- struct meta_data_on_disk * buffer;
+ struct meta_data_on_disk *buffer;
int i, rv = NoError;
if (!inc_local_if_state(mdev, Attaching)) return MDIOError;
@@ -3031,7 +3031,7 @@
void
_dump_packet(drbd_dev *mdev, struct socket *sock,
- int recv, Drbd_Polymorph_Packet *p, char* file, int line)
+ int recv, 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);
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_nl.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -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 (drbd_dev *mdev, unsigned short *tags, struct name *arg) \
{ \
int tag; \
int dlen; \
@@ -62,21 +62,21 @@
return 0; \
} \
} \
- tags = (unsigned short*)((char*)tags + dlen); \
+ tags = (unsigned short *)((char *)tags + dlen); \
} \
return 1; \
}
#define INTEGER(pn, pr, member) \
case pn: /* D_ASSERT( tag_type(tag) == TT_INTEGER ); */ \
- arg->member = *(int*)(tags); \
+ arg->member = *(int *)(tags); \
break;
#define INT64(pn, pr, member) \
case pn: /* D_ASSERT( tag_type(tag) == TT_INT64 ); */ \
- arg->member = *(u64*)(tags); \
+ arg->member = *(u64 *)(tags); \
break;
#define BIT(pn, pr, member) \
case pn: /* D_ASSERT( tag_type(tag) == TT_BIT ); */ \
- arg->member = *(char*)(tags) ? 1 : 0; \
+ arg->member = *(char *)(tags) ? 1 : 0; \
break;
#define STRING(pn, pr, member, len) \
case pn: /* D_ASSERT( tag_type(tag) == TT_STRING ); */ \
@@ -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 (drbd_dev *mdev, struct name *arg, unsigned short *tags) \
{ \
fields \
return tags; \
@@ -97,27 +97,27 @@
#define INTEGER(pn, pr, member) \
*tags++ = pn | pr | TT_INTEGER; \
*tags++ = sizeof(int); \
- *(int*)tags = arg->member; \
- tags = (unsigned short*)((char*)tags+sizeof(int));
+ *(int *)tags = arg->member; \
+ tags = (unsigned short *)((char *)tags+sizeof(int));
#define INT64(pn, pr, member) \
*tags++ = pn | pr | TT_INT64; \
*tags++ = sizeof(u64); \
- *(u64*)tags = arg->member; \
- tags = (unsigned short*)((char*)tags+sizeof(u64));
+ *(u64 *)tags = arg->member; \
+ tags = (unsigned short *)((char *)tags+sizeof(u64));
#define BIT(pn, pr, member) \
*tags++ = pn | pr | TT_BIT; \
*tags++ = sizeof(char); \
- *(char*)tags = arg->member; \
- tags = (unsigned short*)((char*)tags+sizeof(char));
+ *(char *)tags = arg->member; \
+ tags = (unsigned short *)((char *)tags+sizeof(char));
#define STRING(pn, pr, member, len) \
*tags++ = pn | pr | TT_STRING; \
*tags++ = arg->member ## _len; \
memcpy(tags, arg->member, arg->member ## _len); \
- tags = (unsigned short*)((char*)tags + arg->member ## _len);
+ 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);
+void drbd_bcast_ev_helper(drbd_dev *mdev, char *helper_name);
void drbd_nl_send_reply(struct cn_msg *, int);
char *nl_packet_name(int packet_type) {
@@ -139,7 +139,7 @@
void nl_trace_packet(void *data) {
struct cn_msg *req = data;
- struct drbd_nl_cfg_req *nlp = (struct drbd_nl_cfg_req*)req->data;
+ struct drbd_nl_cfg_req *nlp = (struct drbd_nl_cfg_req *)req->data;
printk(KERN_INFO DEVICE_NAME "%d: "
"Netlink: << %s (%d) - seq: %x, ack: %x, len: %x\n",
@@ -151,7 +151,7 @@
void nl_trace_reply(void *data) {
struct cn_msg *req = data;
- struct drbd_nl_cfg_reply *nlp = (struct drbd_nl_cfg_reply*)req->data;
+ struct drbd_nl_cfg_reply *nlp = (struct drbd_nl_cfg_reply *)req->data;
printk(KERN_INFO DEVICE_NAME "%d: "
"Netlink: >> %s (%d) - seq: %x, ack: %x, len: %x\n",
@@ -162,7 +162,7 @@
req->seq, req->ack, req->len);
}
-int drbd_khelper(drbd_dev *mdev, char* cmd)
+int drbd_khelper(drbd_dev *mdev, char *cmd)
{
char mb[12];
char *argv[] = {usermode_helper, cmd, mb, NULL };
@@ -428,7 +428,7 @@
}
}
-char* ppsize(char* buf, unsigned long long size)
+char *ppsize(char *buf, unsigned long long size)
{
/* Needs 9 bytes at max. */
static char units[] = { 'K', 'M', 'G', 'T', 'P', 'E' };
@@ -444,7 +444,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;
@@ -519,7 +519,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. */
@@ -673,9 +673,9 @@
struct drbd_nl_cfg_reply *reply)
{
enum ret_codes retcode;
- struct drbd_backing_dev* nbc = NULL; /* new_backing_conf */
+ struct drbd_backing_dev *nbc = NULL; /* new_backing_conf */
struct inode *inode, *inode2;
- struct lru_cache* resync_lru = NULL;
+ struct lru_cache *resync_lru = NULL;
drbd_state_t ns, os;
int rv, ntries = 0;
@@ -781,7 +781,7 @@
if (bd_claim(nbc->md_bdev,
(nbc->dc.meta_dev_idx==DRBD_MD_INDEX_INTERNAL ||
nbc->dc.meta_dev_idx==DRBD_MD_INDEX_FLEX_INT) ?
- (void *)mdev : (void*) drbd_m_holder )) {
+ (void *)mdev : (void *) drbd_m_holder )) {
retcode = MDMounted;
goto release_bdev_fail;
}
@@ -1102,7 +1102,7 @@
ns = new_conf->max_epoch_size/8;
if (mdev->tl_hash_s != ns) {
- new_tl_hash = kzalloc(ns*sizeof(void*), GFP_KERNEL);
+ new_tl_hash = kzalloc(ns*sizeof(void *), GFP_KERNEL);
if (!new_tl_hash) {
retcode = KMallocFailed;
goto fail;
@@ -1111,14 +1111,14 @@
ns = new_conf->max_buffers/8;
if (new_conf->two_primaries && ( mdev->ee_hash_s != ns ) ) {
- new_ee_hash = kzalloc(ns*sizeof(void*), GFP_KERNEL);
+ new_ee_hash = kzalloc(ns*sizeof(void *), GFP_KERNEL);
if (!new_ee_hash) {
retcode = KMallocFailed;
goto fail;
}
}
- ((char*)new_conf->shared_secret)[SHARED_SECRET_MAX-1] = 0;
+ ((char *)new_conf->shared_secret)[SHARED_SECRET_MAX-1] = 0;
#if 0
/* for the connection loss logic in drbd_recv
@@ -1441,7 +1441,7 @@
*tl++ = TT_END; /* Close the tag list */
- return (int)((char*)tl - (char*)reply->tag_list);
+ return (int)((char *)tl - (char *)reply->tag_list);
}
STATIC int drbd_nl_get_state(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
@@ -1451,10 +1451,10 @@
tl = reply->tag_list;
- tl = get_state_to_tags(mdev, (struct get_state*)&mdev->state, tl);
+ tl = get_state_to_tags(mdev, (struct get_state *)&mdev->state, tl);
*tl++ = TT_END; /* Close the tag list */
- return (int)((char*)tl - (char*)reply->tag_list);
+ return (int)((char *)tl - (char *)reply->tag_list);
}
STATIC int drbd_nl_get_uuids(drbd_dev *mdev, struct drbd_nl_cfg_req *nlp,
@@ -1469,16 +1469,16 @@
*tl++ = T_uuids;
*tl++ = UUID_SIZE*sizeof(u64);
memcpy(tl, mdev->bc->md.uuid, UUID_SIZE*sizeof(u64));
- tl = (unsigned short*)((char*)tl + UUID_SIZE*sizeof(u64));
+ tl = (unsigned short *)((char *)tl + UUID_SIZE*sizeof(u64));
dec_local(mdev);
*tl++ = T_uuids_flags;
*tl++ = sizeof(int);
memcpy(tl, &mdev->bc->md.flags, sizeof(int));
- tl = (unsigned short*)((char*)tl + sizeof(int));
+ tl = (unsigned short *)((char *)tl + sizeof(int));
}
*tl++ = TT_END; /* Close the tag list */
- return (int)((char*)tl - (char*)reply->tag_list);
+ return (int)((char *)tl - (char *)reply->tag_list);
}
@@ -1492,11 +1492,11 @@
/* This is a hand crafted add tag ;) */
*tl++ = T_use_degraded;
*tl++ = sizeof(char);
- *((char*)tl) = test_bit(USE_DEGR_WFC_T, &mdev->flags) ? 1 : 0 ;
- tl = (unsigned short*)((char*)tl + sizeof(char));
+ *((char *)tl) = test_bit(USE_DEGR_WFC_T, &mdev->flags) ? 1 : 0 ;
+ tl = (unsigned short *)((char *)tl + sizeof(char));
*tl++ = TT_END;
- return (int)((char*)tl - (char*)reply->tag_list);
+ return (int)((char *)tl - (char *)reply->tag_list);
}
STATIC drbd_dev *ensure_mdev(struct drbd_nl_cfg_req *nlp)
@@ -1567,10 +1567,10 @@
void drbd_connector_callback(void *data)
{
struct cn_msg *req = data;
- struct drbd_nl_cfg_req *nlp = (struct drbd_nl_cfg_req*)req->data;
+ struct drbd_nl_cfg_req *nlp = (struct drbd_nl_cfg_req *)req->data;
struct cn_handler_struct *cm;
struct cn_msg *cn_reply;
- struct drbd_nl_cfg_reply* reply;
+ struct drbd_nl_cfg_reply *reply;
drbd_dev *mdev;
int retcode, rr;
int reply_size = sizeof(struct cn_msg)
@@ -1601,7 +1601,7 @@
retcode = KMallocFailed;
goto fail;
}
- reply = (struct drbd_nl_cfg_reply*) cn_reply->data;
+ reply = (struct drbd_nl_cfg_reply *) cn_reply->data;
reply->packet_type = cm->reply_body_size ? nlp->packet_type : P_nl_after_last_packet;
reply->minor = nlp->drbd_minor;
@@ -1639,12 +1639,12 @@
sizeof(struct get_state_tag_len_struct)+
sizeof(short int)];
struct cn_msg *cn_reply = (struct cn_msg *) buffer;
- struct drbd_nl_cfg_reply* reply = (struct drbd_nl_cfg_reply*)cn_reply->data;
+ struct drbd_nl_cfg_reply* reply = (struct drbd_nl_cfg_reply *)cn_reply->data;
unsigned short *tl = reply->tag_list;
/* WARN("drbd_bcast_state() got called\n"); */
- tl = get_state_to_tags(mdev, (struct get_state*)&mdev->state, tl);
+ tl = get_state_to_tags(mdev, (struct get_state *)&mdev->state, tl);
*tl++ = TT_END; /* Close the tag list */
cn_reply->id.idx = CN_IDX_DRBD;
@@ -1653,7 +1653,7 @@
cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
cn_reply->ack = 0; /* not used here. */
cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
- (int)((char*)tl - (char*)reply->tag_list);
+ (int)((char *)tl - (char *)reply->tag_list);
cn_reply->flags = 0;
reply->packet_type = P_get_state;
@@ -1665,14 +1665,14 @@
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(drbd_dev *mdev, char *helper_name)
{
char buffer[sizeof(struct cn_msg)+
sizeof(struct drbd_nl_cfg_reply)+
sizeof(struct call_helper_tag_len_struct)+
sizeof(short int)];
struct cn_msg *cn_reply = (struct cn_msg *) buffer;
- struct drbd_nl_cfg_reply* reply = (struct drbd_nl_cfg_reply*)cn_reply->data;
+ struct drbd_nl_cfg_reply* reply = (struct drbd_nl_cfg_reply *)cn_reply->data;
unsigned short *tl = reply->tag_list;
int str_len;
@@ -1682,7 +1682,7 @@
*tl++ = T_helper;
*tl++ = str_len;
memcpy(tl, helper_name, str_len);
- tl = (unsigned short*)((char*)tl + str_len);
+ tl = (unsigned short *)((char *)tl + str_len);
*tl++ = TT_END; /* Close the tag list */
cn_reply->id.idx = CN_IDX_DRBD;
@@ -1691,7 +1691,7 @@
cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
cn_reply->ack = 0; /* not used here. */
cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
- (int)((char*)tl - (char*)reply->tag_list);
+ (int)((char *)tl - (char *)reply->tag_list);
cn_reply->flags = 0;
reply->packet_type = P_call_helper;
@@ -1710,7 +1710,7 @@
sizeof(struct sync_progress_tag_len_struct)+
sizeof(short int)];
struct cn_msg *cn_reply = (struct cn_msg *) buffer;
- struct drbd_nl_cfg_reply* reply = (struct drbd_nl_cfg_reply*)cn_reply->data;
+ struct drbd_nl_cfg_reply* reply = (struct drbd_nl_cfg_reply *)cn_reply->data;
unsigned short *tl = reply->tag_list;
int res;
unsigned long rs_left;
@@ -1731,7 +1731,7 @@
*tl++ = T_sync_progress;
*tl++ = sizeof(int);
memcpy(tl, &res, sizeof(int));
- tl = (unsigned short*)((char*)tl + sizeof(int));
+ tl = (unsigned short *)((char *)tl + sizeof(int));
}
*tl++ = TT_END; /* Close the tag list */
@@ -1741,7 +1741,7 @@
cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
cn_reply->ack = 0; /* not used here. */
cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
- (int)((char*)tl - (char*)reply->tag_list);
+ (int)((char *)tl - (char *)reply->tag_list);
cn_reply->flags = 0;
reply->packet_type = P_sync_progress;
@@ -1794,7 +1794,7 @@
{
char buffer[sizeof(struct cn_msg)+sizeof(struct drbd_nl_cfg_reply)];
struct cn_msg *cn_reply = (struct cn_msg *) buffer;
- struct drbd_nl_cfg_reply* reply = (struct drbd_nl_cfg_reply*)cn_reply->data;
+ struct drbd_nl_cfg_reply* reply = (struct drbd_nl_cfg_reply *)cn_reply->data;
int rr;
cn_reply->id = req->id;
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_proc.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -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)
+STATIC 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)
+STATIC void resync_dump_detail(struct seq_file *seq, struct lc_element *e)
{
struct bm_extent *bme = (struct bm_extent *)e;
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_receiver.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -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)
+STATIC struct page *drbd_pp_alloc(drbd_dev *mdev, unsigned int gfp_mask)
{
unsigned long flags = 0;
struct page *page;
@@ -138,7 +138,7 @@
this is only called from drbd_alloc_ee,
and that is strictly process context! */
if ( (page = drbd_pp_pool) ) {
- drbd_pp_pool = (struct page*)page_private(page);
+ drbd_pp_pool = (struct page *)page_private(page);
drbd_pp_vacant--;
}
spin_unlock_irqrestore(&drbd_pp_lock, flags);
@@ -152,7 +152,7 @@
/* try the pool again, maybe the drbd_kick_lo set some free */
spin_lock_irqsave(&drbd_pp_lock, flags);
if ( (page = drbd_pp_pool) ) {
- drbd_pp_pool = (struct page*)page_private(page);
+ drbd_pp_pool = (struct page *)page_private(page);
drbd_pp_vacant--;
}
spin_unlock_irqrestore(&drbd_pp_lock, flags);
@@ -231,14 +231,14 @@
drbd_wait_ee_list_empty()
*/
-struct Tl_epoch_entry* drbd_alloc_ee(drbd_dev *mdev,
+struct Tl_epoch_entry *drbd_alloc_ee(drbd_dev *mdev,
u64 id,
sector_t sector,
unsigned int data_size,
unsigned int gfp_mask)
{
request_queue_t *q;
- struct Tl_epoch_entry* e;
+ struct Tl_epoch_entry *e;
struct bio_vec *bvec;
struct page *page;
struct bio *bio;
@@ -324,7 +324,7 @@
return NULL;
}
-void drbd_free_ee(drbd_dev *mdev, struct Tl_epoch_entry* e)
+void drbd_free_ee(drbd_dev *mdev, struct Tl_epoch_entry *e)
{
struct bio *bio = e->private_bio;
struct bio_vec *bvec;
@@ -347,10 +347,10 @@
}
/* currently on module unload only */
-int drbd_release_ee(drbd_dev *mdev, struct list_head* list)
+int drbd_release_ee(drbd_dev *mdev, struct list_head *list)
{
int count = 0;
- struct Tl_epoch_entry* e;
+ struct Tl_epoch_entry *e;
struct list_head *le;
spin_lock_irq(&mdev->req_lock);
@@ -478,7 +478,7 @@
spin_unlock_irq(&mdev->req_lock);
}
-STATIC struct socket* drbd_accept(drbd_dev *mdev, struct socket* sock)
+STATIC struct socket *drbd_accept(drbd_dev *mdev, struct socket *sock)
{
struct socket *newsock;
int err = 0;
@@ -943,7 +943,7 @@
{
struct page *page;
int rr, rv = 1;
- void* data;
+ void *data;
page = drbd_pp_alloc(mdev, GFP_KERNEL);
@@ -1008,7 +1008,7 @@
* drbd_process_done_ee() by asender only */
STATIC int e_end_resync_block(drbd_dev *mdev, struct drbd_work *w, int unused)
{
- struct Tl_epoch_entry *e = (struct Tl_epoch_entry*)w;
+ struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
sector_t sector = e->sector;
int ok;
@@ -1158,7 +1158,7 @@
*/
STATIC int e_end_block(drbd_dev *mdev, struct drbd_work *w, int unused)
{
- struct Tl_epoch_entry *e = (struct Tl_epoch_entry*)w;
+ struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
sector_t sector = e->sector;
/* unsigned int epoch_size; */
int ok = 1, pcmd;
@@ -1205,7 +1205,7 @@
STATIC int e_send_discard_ack(drbd_dev *mdev, struct drbd_work *w, int unused)
{
- struct Tl_epoch_entry *e = (struct Tl_epoch_entry*)w;
+ struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
int ok = 1;
D_ASSERT(mdev->net_conf->wire_protocol == DRBD_PROT_C);
@@ -1789,7 +1789,7 @@
return rv;
}
-STATIC void drbd_uuid_dump(drbd_dev *mdev, char* text, u64* uuid)
+STATIC void drbd_uuid_dump(drbd_dev *mdev, char *text, u64 *uuid)
{
INFO("%s %016llX:%016llX:%016llX:%016llX\n",
text,
@@ -2556,7 +2556,7 @@
{
struct hlist_head *slot;
struct hlist_node *n;
- drbd_request_t * req;
+ drbd_request_t *req;
struct list_head *le;
LIST_HEAD(workset);
int i;
@@ -2571,7 +2571,7 @@
list_add(&req->w.list, &workset);
}
}
- memset(mdev->app_reads_hash, 0, APP_R_HSIZE*sizeof(void*));
+ memset(mdev->app_reads_hash, 0, APP_R_HSIZE*sizeof(void *));
while(!list_empty(&workset)) {
le = workset.next;
@@ -2865,7 +2865,7 @@
desc.flags = 0;
rv = crypto_hash_setkey(mdev->cram_hmac_tfm,
- (u8*)mdev->net_conf->shared_secret, key_len);
+ (u8 *)mdev->net_conf->shared_secret, key_len);
if (rv) {
ERR("crypto_hash_setkey() failed with %d\n", rv);
rv = 0;
@@ -3317,13 +3317,13 @@
}
expect = asender_tbl[cmd].pkt_size;
ERR_IF(len != expect-sizeof(Drbd_Header)) {
- dump_packet(mdev, mdev->meta.socket, 1, (void*)h, __FILE__, __LINE__);
+ dump_packet(mdev, mdev->meta.socket, 1, (void *)h, __FILE__, __LINE__);
DUMPI(expect);
}
}
if (received == expect) {
D_ASSERT(cmd != -1);
- dump_packet(mdev, mdev->meta.socket, 1, (void*)h, __FILE__, __LINE__);
+ dump_packet(mdev, mdev->meta.socket, 1, (void *)h, __FILE__, __LINE__);
if (!asender_tbl[cmd].process(mdev, h)) goto err;
buf = h;
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_req.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -1058,7 +1058,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 = (drbd_dev*) q->queuedata;
if (drbd_fail_request_early(mdev, bio_data_dir(bio) & WRITE)) {
bio_endio(bio, bio->bi_size, -EPERM);
@@ -1133,7 +1133,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 = (drbd_dev*) 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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_req.h 2007-07-24 13:18:46 UTC (rev 2991)
@@ -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(drbd_dev *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(drbd_dev *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 drbd_request_t *_ack_id_to_req(drbd_dev *mdev, u64 id, sector_t sector)
{
struct hlist_head *slot = tl_hash_slot(mdev, sector);
struct hlist_node *n;
- drbd_request_t * req;
+ drbd_request_t *req;
hlist_for_each_entry(req, n, slot, colision) {
if ((unsigned long)req == (unsigned long)id) {
@@ -242,12 +242,12 @@
}
}
ERR("_ack_id_to_req: failed to find req %p, sector %llus in list\n",
- (void*)(unsigned long)id, (unsigned long long)sector);
+ (void *)(unsigned long)id, (unsigned long long)sector);
return NULL;
}
/* 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(drbd_dev *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 drbd_request_t *_ar_id_to_req(drbd_dev *mdev, u64 id, sector_t sector)
{
struct hlist_head *slot = ar_hash_slot(mdev, sector);
struct hlist_node *n;
- drbd_request_t * req;
+ drbd_request_t *req;
hlist_for_each_entry(req, n, slot, colision) {
if ((unsigned long)req == (unsigned long)id) {
@@ -270,7 +270,7 @@
return NULL;
}
-static inline drbd_request_t* drbd_req_new(drbd_dev *mdev, struct bio *bio_src)
+static inline drbd_request_t *drbd_req_new(drbd_dev *mdev, struct bio *bio_src)
{
struct bio *bio;
drbd_request_t *req = mempool_alloc(drbd_request_mempool, GFP_NOIO);
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_strings.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -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(drbd_conns_t 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(drbd_role_t 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(drbd_disks_t 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(set_st_err_t err) {
return err < SS_DeviceInUse ? "TOO_SMALL" :
err > SS_TwoPrimaries ? "TOO_LARGE"
: drbd_state_sw_errors[-err];
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_worker.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -68,7 +68,7 @@
/* error parameter ignored:
* drbd_md_sync_page_io explicitly tests bio_uptodate(bio); */
- complete((struct completion*)bio->bi_private);
+ complete((struct completion *)bio->bi_private);
return 0;
}
@@ -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;
@@ -222,9 +222,9 @@
return 0;
}
-int w_io_error(drbd_dev* mdev, struct drbd_work* w, int cancel)
+int w_io_error(drbd_dev *mdev, struct drbd_work *w, int cancel)
{
- drbd_request_t *req = (drbd_request_t*)w;
+ drbd_request_t *req = (drbd_request_t *)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(drbd_dev *mdev, struct drbd_work *w, int cancel)
{
- drbd_request_t *req = (drbd_request_t*)w;
+ drbd_request_t *req = (drbd_request_t *)w;
spin_lock_irq(&mdev->req_lock);
if ( cancel ||
@@ -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(drbd_dev *mdev, struct drbd_work *w, int cancel)
{
unsigned long bit;
sector_t sector;
@@ -551,7 +551,7 @@
*/
int w_e_end_data_req(drbd_dev *mdev, struct drbd_work *w, int cancel)
{
- struct Tl_epoch_entry *e = (struct Tl_epoch_entry*)w;
+ struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
int ok;
if (unlikely(cancel)) {
@@ -595,7 +595,7 @@
*/
int w_e_end_rsdata_req(drbd_dev *mdev, struct drbd_work *w, int cancel)
{
- struct Tl_epoch_entry *e = (struct Tl_epoch_entry*)w;
+ struct Tl_epoch_entry *e = (struct Tl_epoch_entry *)w;
int ok;
if (unlikely(cancel)) {
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/drbd_wrappers.h 2007-07-24 13:18:46 UTC (rev 2991)
@@ -14,7 +14,7 @@
#endif
/* see get_sb_bdev and bd_claim */
-extern char* drbd_sec_holder;
+extern char *drbd_sec_holder;
/* bi_end_io handlers */
extern int drbd_md_io_complete (struct bio *bio, unsigned int bytes_done, int error);
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/linux/drbd.h 2007-07-24 13:18:46 UTC (rev 2991)
@@ -222,10 +222,10 @@
} 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(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);
#ifndef BDEVNAME_SIZE
# define BDEVNAME_SIZE 32
Modified: branches/drbd-8.0-for-linus/drbd/linux/drbd_tag_magic.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/linux/drbd_tag_magic.h 2007-07-24 13:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/linux/drbd_tag_magic.h 2007-07-24 13:18:46 UTC (rev 2991)
@@ -65,7 +65,7 @@
};
struct tag {
- const char* name;
+ const char *name;
int type_n_flags;
int max_len;
};
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:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/lru_cache.c 2007-07-24 13:18:46 UTC (rev 2991)
@@ -43,7 +43,7 @@
* struct lru_cache, and the hash table slots.
* returns pointer to a newly initialized lru_cache object with said parameters.
*/
-struct lru_cache* lc_alloc(const char *name, unsigned int e_count,
+struct lru_cache *lc_alloc(const char *name, unsigned int e_count,
size_t e_size, void *private_p)
{
unsigned long bytes;
@@ -81,12 +81,12 @@
* lc_free: Frees memory allocated by lc_alloc.
* @lc: The lru_cache object
*/
-void lc_free(struct lru_cache* lc)
+void lc_free(struct lru_cache *lc)
{
vfree(lc);
}
-size_t lc_printf_stats(struct seq_file *seq, struct lru_cache* lc)
+size_t lc_printf_stats(struct seq_file *seq, struct lru_cache *lc)
{
/* NOTE:
* total calls to lc_get are
@@ -100,7 +100,7 @@
lc->hits, lc->misses, lc->starving, lc->dirty, lc->changed);
}
-static unsigned int lc_hash_fn(struct lru_cache* lc, unsigned int enr)
+static unsigned int lc_hash_fn(struct lru_cache *lc, unsigned int enr)
{
return enr % lc->nr_elements;
}
@@ -112,7 +112,7 @@
* @lc: The lru_cache object
* @enr: element number
*/
-struct lc_element* lc_find(struct lru_cache* lc, unsigned int enr)
+struct lc_element *lc_find(struct lru_cache *lc, unsigned int enr)
{
struct hlist_node *n;
struct lc_element *e;
@@ -125,7 +125,7 @@
return NULL;
}
-STATIC struct lc_element * lc_evict(struct lru_cache* lc)
+STATIC struct lc_element *lc_evict(struct lru_cache *lc)
{
struct list_head *n;
struct lc_element *e;
@@ -147,7 +147,7 @@
* @lc: The lru_cache object
* @e: The element to remove
*/
-void lc_del(struct lru_cache* lc, struct lc_element *e)
+void lc_del(struct lru_cache *lc, struct lc_element *e)
{
/* FIXME what to do with refcnt != 0 ? */
PARANOIA_ENTRY();
@@ -160,7 +160,7 @@
RETURN();
}
-STATIC struct lc_element* lc_get_unused_element(struct lru_cache* lc)
+STATIC 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)
+STATIC 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 */
@@ -207,7 +207,7 @@
* @lc: The lru_cache object
* @enr: element number
*/
-struct lc_element* lc_get(struct lru_cache* lc, unsigned int enr)
+struct lc_element *lc_get(struct lru_cache *lc, unsigned int enr)
{
struct lc_element *e;
@@ -264,7 +264,7 @@
* but only gets a new reference on an existing element.
* you either get the requested element, or NULL.
*/
-struct lc_element* lc_try_get(struct lru_cache* lc, unsigned int enr)
+struct lc_element *lc_try_get(struct lru_cache *lc, unsigned int enr)
{
struct lc_element *e;
@@ -286,7 +286,7 @@
RETURN(e);
}
-void lc_changed(struct lru_cache* lc, struct lc_element* e)
+void lc_changed(struct lru_cache *lc, struct lc_element *e)
{
PARANOIA_ENTRY();
BUG_ON(e != lc->changing_element);
@@ -302,7 +302,7 @@
}
-unsigned int lc_put(struct lru_cache* lc, struct lc_element* e)
+unsigned int lc_put(struct lru_cache *lc, struct lc_element *e)
{
BUG_ON(!lc);
BUG_ON(!lc->nr_elements);
@@ -328,7 +328,7 @@
* @enr: element number
* @index: The elements' position in the cache
*/
-void lc_set(struct lru_cache* lc, unsigned int enr, int index)
+void lc_set(struct lru_cache *lc, unsigned int enr, int index)
{
struct lc_element *e;
@@ -346,7 +346,7 @@
/**
* lc_dump: Dump a complete LRU cache to seq in textual form.
*/
-void lc_dump(struct lru_cache* lc, struct seq_file *seq, char* utext,
+void lc_dump(struct lru_cache *lc, struct seq_file *seq, char *utext,
void (*detail) (struct seq_file *, struct lc_element *) )
{
unsigned int nr_elements = lc->nr_elements;
Modified: branches/drbd-8.0-for-linus/drbd/lru_cache.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/lru_cache.h 2007-07-24 13:06:52 UTC (rev 2990)
+++ branches/drbd-8.0-for-linus/drbd/lru_cache.h 2007-07-24 13:18:46 UTC (rev 2991)
@@ -98,50 +98,50 @@
#define LC_DIRTY (1<<__LC_DIRTY)
#define LC_STARVING (1<<__LC_STARVING)
-extern struct lru_cache* lc_alloc(const char *name, unsigned int e_count,
+extern struct lru_cache *lc_alloc(const char *name, unsigned int e_count,
size_t e_size, void *private_p);
-extern void lc_free(struct lru_cache* lc);
-extern void lc_set (struct lru_cache* lc, unsigned int enr, int index);
-extern void lc_del (struct lru_cache* lc, struct lc_element *element);
+extern void lc_free(struct lru_cache *lc);
+extern void lc_set (struct lru_cache *lc, unsigned int enr, int index);
+extern void lc_del (struct lru_cache *lc, struct lc_element *element);
-extern struct lc_element* lc_try_get(struct lru_cache* lc, unsigned int enr);
-extern struct lc_element* lc_find(struct lru_cache* lc, unsigned int enr);
-extern struct lc_element* lc_get (struct lru_cache* lc, unsigned int enr);
-extern unsigned int lc_put (struct lru_cache* lc, struct lc_element* e);
-extern void lc_changed(struct lru_cache* lc, struct lc_element* e);
+extern struct lc_element *lc_try_get(struct lru_cache *lc, unsigned int enr);
+extern struct lc_element *lc_find(struct lru_cache *lc, unsigned int enr);
+extern struct lc_element *lc_get (struct lru_cache *lc, unsigned int enr);
+extern unsigned int lc_put (struct lru_cache *lc, struct lc_element *e);
+extern void lc_changed(struct lru_cache *lc, struct lc_element *e);
struct seq_file;
-extern size_t lc_printf_stats(struct seq_file *seq, struct lru_cache* lc);
+extern size_t lc_printf_stats(struct seq_file *seq, struct lru_cache *lc);
-void lc_dump(struct lru_cache* lc, struct seq_file *seq, char* utext,
+void lc_dump(struct lru_cache *lc, struct seq_file *seq, char *utext,
void (*detail) (struct seq_file *, struct lc_element *) );
/* This can be used to stop lc_get from changing the set of active elements.
* Note that the reference counts and order on the lru list may still change.
* returns true if we aquired the lock.
*/
-static inline int lc_try_lock(struct lru_cache* lc)
+static inline int lc_try_lock(struct lru_cache *lc)
{
return !test_and_set_bit(__LC_DIRTY, &lc->flags);
}
-static inline void lc_unlock(struct lru_cache* lc)
+static inline void lc_unlock(struct lru_cache *lc)
{
clear_bit(__LC_DIRTY, &lc->flags);
smp_mb__after_clear_bit();
}
-static inline int lc_is_used(struct lru_cache* lc, unsigned int enr)
+static inline int lc_is_used(struct lru_cache *lc, unsigned int enr)
{
- struct lc_element* e = lc_find(lc, enr);
+ struct lc_element *e = lc_find(lc, enr);
return (e && e->refcnt);
}
#define LC_FREE (-1U)
-#define lc_e_base(lc) ((char*) ( (lc)->slot + (lc)->nr_elements ) )
-#define lc_entry(lc, i) ((struct lc_element*) \
+#define lc_e_base(lc) ((char *) ( (lc)->slot + (lc)->nr_elements ) )
+#define lc_entry(lc, i) ((struct lc_element *) \
(lc_e_base(lc) + (i)*(lc)->element_size))
-#define lc_index_of(lc, e) (((char*)(e) - lc_e_base(lc))/(lc)->element_size)
+#define lc_index_of(lc, e) (((char *)(e) - lc_e_base(lc))/(lc)->element_size)
#endif
More information about the drbd-cvs
mailing list