[DRBD-cvs] svn commit by lars - r2995 -
branches/drbd-8.0-for-linus/drbd -
247dd801ab93db7e38b53bf818aef93def9b2ace fix space betw
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Tue Jul 24 15:38:37 CEST 2007
Author: lars
Date: 2007-07-24 15:38:35 +0200 (Tue, 24 Jul 2007)
New Revision: 2995
Modified:
branches/drbd-8.0-for-linus/drbd/drbd_int.h
branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
branches/drbd-8.0-for-linus/drbd/drbd_wrappers.h
branches/drbd-8.0-for-linus/drbd/lru_cache.h
Log:
247dd801ab93db7e38b53bf818aef93def9b2ace fix space between function name and opening brace
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:35:47 UTC (rev 2994)
+++ branches/drbd-8.0-for-linus/drbd/drbd_int.h 2007-07-24 13:38:35 UTC (rev 2995)
@@ -1117,7 +1117,7 @@
#if DRBD_MAX_SECTORS_BM < DRBD_MAX_SECTORS_32
#define DRBD_MAX_SECTORS DRBD_MAX_SECTORS_BM
#define DRBD_MAX_SECTORS_FLEX DRBD_MAX_SECTORS_BM
-#elif ( !defined(CONFIG_LBD) ) && ( BITS_PER_LONG == 32 )
+#elif !defined(CONFIG_LBD) && BITS_PER_LONG == 32
#define DRBD_MAX_SECTORS DRBD_MAX_SECTORS_32
#define DRBD_MAX_SECTORS_FLEX DRBD_MAX_SECTORS_32
#else
@@ -1135,43 +1135,43 @@
/* 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 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_set_bit(drbd_dev *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_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 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);
/* for receive_bitmap */
-extern void drbd_bm_merge_lel (drbd_dev *mdev, size_t offset, size_t number,
+extern void drbd_bm_merge_lel(drbd_dev *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(drbd_dev *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(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_unlock (drbd_dev *mdev);
+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);
@@ -1323,19 +1323,19 @@
extern int drbd_md_sync_page_io(drbd_dev *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(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 void resync_timer_fn(unsigned long 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:35:47 UTC (rev 2994)
+++ branches/drbd-8.0-for-linus/drbd/drbd_receiver.c 2007-07-24 13:38:35 UTC (rev 2995)
@@ -617,12 +617,12 @@
* Make sure to use 0 as portnumber, so linux selects
* a free one dynamically.
*/
- memcpy (&src_in, &(mdev->net_conf->my_addr), sizeof(struct sockaddr_in));
+ memcpy(&src_in, &(mdev->net_conf->my_addr), sizeof(struct sockaddr_in));
src_in.sin_port = 0;
err = sock->ops->bind(sock,
(struct sockaddr *) &src_in,
- sizeof (struct sockaddr_in));
+ sizeof(struct sockaddr_in));
if (err) {
ERR("Unable to bind source sock (%d)\n", err);
sock_release(sock);
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:35:47 UTC (rev 2994)
+++ branches/drbd-8.0-for-linus/drbd/drbd_wrappers.h 2007-07-24 13:38:35 UTC (rev 2995)
@@ -17,11 +17,11 @@
extern char *drbd_sec_holder;
/* bi_end_io handlers */
-extern int drbd_md_io_complete (struct bio *bio, unsigned int bytes_done, int error);
+extern int drbd_md_io_complete(struct bio *bio, unsigned int bytes_done, int error);
-extern int drbd_endio_read_sec (struct bio *bio, unsigned int bytes_done, int error);
+extern int drbd_endio_read_sec(struct bio *bio, unsigned int bytes_done, int error);
extern int drbd_endio_write_sec(struct bio *bio, unsigned int bytes_done, int error);
-extern int drbd_endio_pri (struct bio *bio, unsigned int bytes_done, int error);
+extern int drbd_endio_pri(struct bio *bio, unsigned int bytes_done, int error);
static inline sector_t drbd_get_hardsect(struct block_device *bdev)
{
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:35:47 UTC (rev 2994)
+++ branches/drbd-8.0-for-linus/drbd/lru_cache.h 2007-07-24 13:38:35 UTC (rev 2995)
@@ -101,14 +101,14 @@
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_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_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);
More information about the drbd-cvs
mailing list