aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2006-01-14 16:20:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 21:27:06 -0500
commit858119e159384308a5dde67776691a2ebf70df0f (patch)
treef360768f999d51edc0863917ce0bf79e88c0ec4c /drivers/md
parentb0a9499c3dd50d333e2aedb7e894873c58da3785 (diff)
[PATCH] Unlinline a bunch of other functions
Remove the "inline" keyword from a bunch of big functions in the kernel with the goal of shrinking it by 30kb to 40kb Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/bitmap.c2
-rw-r--r--drivers/md/dm-crypt.c2
-rw-r--r--drivers/md/dm-ioctl.c4
-rw-r--r--drivers/md/dm-snap.c2
-rw-r--r--drivers/md/dm.c2
-rw-r--r--drivers/md/raid1.c4
-rw-r--r--drivers/md/raid10.c4
-rw-r--r--drivers/md/raid5.c10
-rw-r--r--drivers/md/raid6main.c8
9 files changed, 19 insertions, 19 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 76a189ceb529..eae4473eadde 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -200,7 +200,7 @@ out:
200/* if page is completely empty, put it back on the free list, or dealloc it */ 200/* if page is completely empty, put it back on the free list, or dealloc it */
201/* if page was hijacked, unmark the flag so it might get alloced next time */ 201/* if page was hijacked, unmark the flag so it might get alloced next time */
202/* Note: lock should be held when calling this */ 202/* Note: lock should be held when calling this */
203static inline void bitmap_checkfree(struct bitmap *bitmap, unsigned long page) 203static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page)
204{ 204{
205 char *ptr; 205 char *ptr;
206 206
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index a601a427885c..e7a650f9ca07 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -228,7 +228,7 @@ static struct crypt_iv_operations crypt_iv_essiv_ops = {
228}; 228};
229 229
230 230
231static inline int 231static int
232crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out, 232crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out,
233 struct scatterlist *in, unsigned int length, 233 struct scatterlist *in, unsigned int length,
234 int write, sector_t sector) 234 int write, sector_t sector)
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 561bda5011e0..1235135b384b 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -598,7 +598,7 @@ static int dev_create(struct dm_ioctl *param, size_t param_size)
598/* 598/*
599 * Always use UUID for lookups if it's present, otherwise use name or dev. 599 * Always use UUID for lookups if it's present, otherwise use name or dev.
600 */ 600 */
601static inline struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param) 601static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
602{ 602{
603 if (*param->uuid) 603 if (*param->uuid)
604 return __get_uuid_cell(param->uuid); 604 return __get_uuid_cell(param->uuid);
@@ -608,7 +608,7 @@ static inline struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
608 return dm_get_mdptr(huge_decode_dev(param->dev)); 608 return dm_get_mdptr(huge_decode_dev(param->dev));
609} 609}
610 610
611static inline struct mapped_device *find_device(struct dm_ioctl *param) 611static struct mapped_device *find_device(struct dm_ioctl *param)
612{ 612{
613 struct hash_cell *hc; 613 struct hash_cell *hc;
614 struct mapped_device *md = NULL; 614 struct mapped_device *md = NULL;
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 4b9dd8fb1e5c..87727d84dbba 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -691,7 +691,7 @@ static void copy_callback(int read_err, unsigned int write_err, void *context)
691/* 691/*
692 * Dispatches the copy operation to kcopyd. 692 * Dispatches the copy operation to kcopyd.
693 */ 693 */
694static inline void start_copy(struct pending_exception *pe) 694static void start_copy(struct pending_exception *pe)
695{ 695{
696 struct dm_snapshot *s = pe->snap; 696 struct dm_snapshot *s = pe->snap;
697 struct io_region src, dest; 697 struct io_region src, dest;
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 097d1e540090..8c16359f8b01 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -293,7 +293,7 @@ struct dm_table *dm_get_table(struct mapped_device *md)
293 * Decrements the number of outstanding ios that a bio has been 293 * Decrements the number of outstanding ios that a bio has been
294 * cloned into, completing the original io if necc. 294 * cloned into, completing the original io if necc.
295 */ 295 */
296static inline void dec_pending(struct dm_io *io, int error) 296static void dec_pending(struct dm_io *io, int error)
297{ 297{
298 if (error) 298 if (error)
299 io->error = error; 299 io->error = error;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index a06ff91f27e2..d39f584cd8b3 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -176,7 +176,7 @@ static void put_all_bios(conf_t *conf, r1bio_t *r1_bio)
176 } 176 }
177} 177}
178 178
179static inline void free_r1bio(r1bio_t *r1_bio) 179static void free_r1bio(r1bio_t *r1_bio)
180{ 180{
181 conf_t *conf = mddev_to_conf(r1_bio->mddev); 181 conf_t *conf = mddev_to_conf(r1_bio->mddev);
182 182
@@ -190,7 +190,7 @@ static inline void free_r1bio(r1bio_t *r1_bio)
190 mempool_free(r1_bio, conf->r1bio_pool); 190 mempool_free(r1_bio, conf->r1bio_pool);
191} 191}
192 192
193static inline void put_buf(r1bio_t *r1_bio) 193static void put_buf(r1bio_t *r1_bio)
194{ 194{
195 conf_t *conf = mddev_to_conf(r1_bio->mddev); 195 conf_t *conf = mddev_to_conf(r1_bio->mddev);
196 int i; 196 int i;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 9e658e519a27..9130d051b474 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -176,7 +176,7 @@ static void put_all_bios(conf_t *conf, r10bio_t *r10_bio)
176 } 176 }
177} 177}
178 178
179static inline void free_r10bio(r10bio_t *r10_bio) 179static void free_r10bio(r10bio_t *r10_bio)
180{ 180{
181 conf_t *conf = mddev_to_conf(r10_bio->mddev); 181 conf_t *conf = mddev_to_conf(r10_bio->mddev);
182 182
@@ -190,7 +190,7 @@ static inline void free_r10bio(r10bio_t *r10_bio)
190 mempool_free(r10_bio, conf->r10bio_pool); 190 mempool_free(r10_bio, conf->r10bio_pool);
191} 191}
192 192
193static inline void put_buf(r10bio_t *r10_bio) 193static void put_buf(r10bio_t *r10_bio)
194{ 194{
195 conf_t *conf = mddev_to_conf(r10_bio->mddev); 195 conf_t *conf = mddev_to_conf(r10_bio->mddev);
196 196
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 54f4a9847e38..25976bfb6f9c 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -69,7 +69,7 @@
69 69
70static void print_raid5_conf (raid5_conf_t *conf); 70static void print_raid5_conf (raid5_conf_t *conf);
71 71
72static inline void __release_stripe(raid5_conf_t *conf, struct stripe_head *sh) 72static void __release_stripe(raid5_conf_t *conf, struct stripe_head *sh)
73{ 73{
74 if (atomic_dec_and_test(&sh->count)) { 74 if (atomic_dec_and_test(&sh->count)) {
75 if (!list_empty(&sh->lru)) 75 if (!list_empty(&sh->lru))
@@ -118,7 +118,7 @@ static inline void remove_hash(struct stripe_head *sh)
118 hlist_del_init(&sh->hash); 118 hlist_del_init(&sh->hash);
119} 119}
120 120
121static inline void insert_hash(raid5_conf_t *conf, struct stripe_head *sh) 121static void insert_hash(raid5_conf_t *conf, struct stripe_head *sh)
122{ 122{
123 struct hlist_head *hp = stripe_hash(conf, sh->sector); 123 struct hlist_head *hp = stripe_hash(conf, sh->sector);
124 124
@@ -178,7 +178,7 @@ static int grow_buffers(struct stripe_head *sh, int num)
178 178
179static void raid5_build_block (struct stripe_head *sh, int i); 179static void raid5_build_block (struct stripe_head *sh, int i);
180 180
181static inline void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx) 181static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx)
182{ 182{
183 raid5_conf_t *conf = sh->raid_conf; 183 raid5_conf_t *conf = sh->raid_conf;
184 int disks = conf->raid_disks, i; 184 int disks = conf->raid_disks, i;
@@ -1415,7 +1415,7 @@ static void handle_stripe(struct stripe_head *sh)
1415 } 1415 }
1416} 1416}
1417 1417
1418static inline void raid5_activate_delayed(raid5_conf_t *conf) 1418static void raid5_activate_delayed(raid5_conf_t *conf)
1419{ 1419{
1420 if (atomic_read(&conf->preread_active_stripes) < IO_THRESHOLD) { 1420 if (atomic_read(&conf->preread_active_stripes) < IO_THRESHOLD) {
1421 while (!list_empty(&conf->delayed_list)) { 1421 while (!list_empty(&conf->delayed_list)) {
@@ -1431,7 +1431,7 @@ static inline void raid5_activate_delayed(raid5_conf_t *conf)
1431 } 1431 }
1432} 1432}
1433 1433
1434static inline void activate_bit_delay(raid5_conf_t *conf) 1434static void activate_bit_delay(raid5_conf_t *conf)
1435{ 1435{
1436 /* device_lock is held */ 1436 /* device_lock is held */
1437 struct list_head head; 1437 struct list_head head;
diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c
index 8c823d686a60..f618a53b98be 100644
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
@@ -88,7 +88,7 @@ static inline int raid6_next_disk(int disk, int raid_disks)
88 88
89static void print_raid6_conf (raid6_conf_t *conf); 89static void print_raid6_conf (raid6_conf_t *conf);
90 90
91static inline void __release_stripe(raid6_conf_t *conf, struct stripe_head *sh) 91static void __release_stripe(raid6_conf_t *conf, struct stripe_head *sh)
92{ 92{
93 if (atomic_dec_and_test(&sh->count)) { 93 if (atomic_dec_and_test(&sh->count)) {
94 if (!list_empty(&sh->lru)) 94 if (!list_empty(&sh->lru))
@@ -197,7 +197,7 @@ static int grow_buffers(struct stripe_head *sh, int num)
197 197
198static void raid6_build_block (struct stripe_head *sh, int i); 198static void raid6_build_block (struct stripe_head *sh, int i);
199 199
200static inline void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx) 200static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx)
201{ 201{
202 raid6_conf_t *conf = sh->raid_conf; 202 raid6_conf_t *conf = sh->raid_conf;
203 int disks = conf->raid_disks, i; 203 int disks = conf->raid_disks, i;
@@ -1577,7 +1577,7 @@ static void handle_stripe(struct stripe_head *sh, struct page *tmp_page)
1577 } 1577 }
1578} 1578}
1579 1579
1580static inline void raid6_activate_delayed(raid6_conf_t *conf) 1580static void raid6_activate_delayed(raid6_conf_t *conf)
1581{ 1581{
1582 if (atomic_read(&conf->preread_active_stripes) < IO_THRESHOLD) { 1582 if (atomic_read(&conf->preread_active_stripes) < IO_THRESHOLD) {
1583 while (!list_empty(&conf->delayed_list)) { 1583 while (!list_empty(&conf->delayed_list)) {
@@ -1593,7 +1593,7 @@ static inline void raid6_activate_delayed(raid6_conf_t *conf)
1593 } 1593 }
1594} 1594}
1595 1595
1596static inline void activate_bit_delay(raid6_conf_t *conf) 1596static void activate_bit_delay(raid6_conf_t *conf)
1597{ 1597{
1598 /* device_lock is held */ 1598 /* device_lock is held */
1599 struct list_head head; 1599 struct list_head head;