diff options
author | Ben Dooks <ben@fluff.org.uk> | 2005-10-30 18:02:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:25 -0500 |
commit | 381be25458524f9bcec5bf1e40c82d1ebb408475 (patch) | |
tree | dc6ea4d6cf0ef93b8cb5103d53caea6333b129cc | |
parent | 1a80ba88273097933f93b1f40537337416798c70 (diff) |
[PATCH] ext3: sparse fixes
Fix warnings from sparse due to un-declared functions that should either
have a header file or have been declared static
fs/ext2/bitmap.c:14:15: warning: symbol 'ext2_count_free' was not declared. Should it be static?
fs/ext2/namei.c:92:15: warning: symbol 'ext2_get_parent' was not declared. Should it be static?
fs/ext3/bitmap.c:15:15: warning: symbol 'ext3_count_free' was not declared. Should it be static?
fs/ext3/namei.c:1013:15: warning: symbol 'ext3_get_parent' was not declared. Should it be static?
fs/ext3/xattr.c:214:1: warning: symbol 'ext3_xattr_block_get' was not declared. Should it be static?
fs/ext3/xattr.c:358:1: warning: symbol 'ext3_xattr_block_list' was not declared. Should it be static?
fs/ext3/xattr.c:630:1: warning: symbol 'ext3_xattr_block_find' was not declared. Should it be static?
fs/ext3/xattr.c:863:1: warning: symbol 'ext3_xattr_ibody_find' was not declared. Should it be static?
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/ext3/balloc.c | 2 | ||||
-rw-r--r-- | fs/ext3/bitmap.c | 2 | ||||
-rw-r--r-- | fs/ext3/bitmap.h | 8 | ||||
-rw-r--r-- | fs/ext3/ialloc.c | 1 | ||||
-rw-r--r-- | fs/ext3/namei.c | 2 | ||||
-rw-r--r-- | fs/ext3/namei.h | 8 | ||||
-rw-r--r-- | fs/ext3/super.c | 4 | ||||
-rw-r--r-- | fs/ext3/xattr.c | 8 |
8 files changed, 29 insertions, 6 deletions
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c index 032c7ba1b13f..7992d21e0e09 100644 --- a/fs/ext3/balloc.c +++ b/fs/ext3/balloc.c | |||
@@ -20,6 +20,8 @@ | |||
20 | #include <linux/quotaops.h> | 20 | #include <linux/quotaops.h> |
21 | #include <linux/buffer_head.h> | 21 | #include <linux/buffer_head.h> |
22 | 22 | ||
23 | #include "bitmap.h" | ||
24 | |||
23 | /* | 25 | /* |
24 | * balloc.c contains the blocks allocation and deallocation routines | 26 | * balloc.c contains the blocks allocation and deallocation routines |
25 | */ | 27 | */ |
diff --git a/fs/ext3/bitmap.c b/fs/ext3/bitmap.c index 6c419b9ab0e8..5b4ba3e246e6 100644 --- a/fs/ext3/bitmap.c +++ b/fs/ext3/bitmap.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/buffer_head.h> | 10 | #include <linux/buffer_head.h> |
11 | 11 | #include "bitmap.h" | |
12 | 12 | ||
13 | static int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0}; | 13 | static int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0}; |
14 | 14 | ||
diff --git a/fs/ext3/bitmap.h b/fs/ext3/bitmap.h new file mode 100644 index 000000000000..6ee503a6bb4e --- /dev/null +++ b/fs/ext3/bitmap.h | |||
@@ -0,0 +1,8 @@ | |||
1 | /* linux/fs/ext3/bitmap.c | ||
2 | * | ||
3 | * Copyright (C) 2005 Simtec Electronics | ||
4 | * Ben Dooks <ben@simtec.co.uk> | ||
5 | * | ||
6 | */ | ||
7 | |||
8 | extern unsigned long ext3_count_free (struct buffer_head *, unsigned int ); | ||
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index 0eb4f90268da..df3f517c54ac 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | #include <asm/byteorder.h> | 27 | #include <asm/byteorder.h> |
28 | 28 | ||
29 | #include "bitmap.h" | ||
29 | #include "xattr.h" | 30 | #include "xattr.h" |
30 | #include "acl.h" | 31 | #include "acl.h" |
31 | 32 | ||
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 50378d8ff84b..b3c690a3b54a 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
@@ -36,6 +36,8 @@ | |||
36 | #include <linux/quotaops.h> | 36 | #include <linux/quotaops.h> |
37 | #include <linux/buffer_head.h> | 37 | #include <linux/buffer_head.h> |
38 | #include <linux/smp_lock.h> | 38 | #include <linux/smp_lock.h> |
39 | |||
40 | #include "namei.h" | ||
39 | #include "xattr.h" | 41 | #include "xattr.h" |
40 | #include "acl.h" | 42 | #include "acl.h" |
41 | 43 | ||
diff --git a/fs/ext3/namei.h b/fs/ext3/namei.h new file mode 100644 index 000000000000..f2ce2b0065c9 --- /dev/null +++ b/fs/ext3/namei.h | |||
@@ -0,0 +1,8 @@ | |||
1 | /* linux/fs/ext3/namei.h | ||
2 | * | ||
3 | * Copyright (C) 2005 Simtec Electronics | ||
4 | * Ben Dooks <ben@simtec.co.uk> | ||
5 | * | ||
6 | */ | ||
7 | |||
8 | extern struct dentry *ext3_get_parent(struct dentry *child); | ||
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 097383c11154..f594989ccb7a 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -36,9 +36,12 @@ | |||
36 | #include <linux/namei.h> | 36 | #include <linux/namei.h> |
37 | #include <linux/quotaops.h> | 37 | #include <linux/quotaops.h> |
38 | #include <linux/seq_file.h> | 38 | #include <linux/seq_file.h> |
39 | |||
39 | #include <asm/uaccess.h> | 40 | #include <asm/uaccess.h> |
41 | |||
40 | #include "xattr.h" | 42 | #include "xattr.h" |
41 | #include "acl.h" | 43 | #include "acl.h" |
44 | #include "namei.h" | ||
42 | 45 | ||
43 | static int ext3_load_journal(struct super_block *, struct ext3_super_block *); | 46 | static int ext3_load_journal(struct super_block *, struct ext3_super_block *); |
44 | static int ext3_create_journal(struct super_block *, struct ext3_super_block *, | 47 | static int ext3_create_journal(struct super_block *, struct ext3_super_block *, |
@@ -615,7 +618,6 @@ static struct super_operations ext3_sops = { | |||
615 | #endif | 618 | #endif |
616 | }; | 619 | }; |
617 | 620 | ||
618 | struct dentry *ext3_get_parent(struct dentry *child); | ||
619 | static struct export_operations ext3_export_ops = { | 621 | static struct export_operations ext3_export_ops = { |
620 | .get_parent = ext3_get_parent, | 622 | .get_parent = ext3_get_parent, |
621 | }; | 623 | }; |
diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c index 269c7b92db9a..430de9f63be3 100644 --- a/fs/ext3/xattr.c +++ b/fs/ext3/xattr.c | |||
@@ -210,7 +210,7 @@ ext3_xattr_find_entry(struct ext3_xattr_entry **pentry, int name_index, | |||
210 | return cmp ? -ENODATA : 0; | 210 | return cmp ? -ENODATA : 0; |
211 | } | 211 | } |
212 | 212 | ||
213 | int | 213 | static int |
214 | ext3_xattr_block_get(struct inode *inode, int name_index, const char *name, | 214 | ext3_xattr_block_get(struct inode *inode, int name_index, const char *name, |
215 | void *buffer, size_t buffer_size) | 215 | void *buffer, size_t buffer_size) |
216 | { | 216 | { |
@@ -354,7 +354,7 @@ ext3_xattr_list_entries(struct inode *inode, struct ext3_xattr_entry *entry, | |||
354 | return buffer_size - rest; | 354 | return buffer_size - rest; |
355 | } | 355 | } |
356 | 356 | ||
357 | int | 357 | static int |
358 | ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size) | 358 | ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size) |
359 | { | 359 | { |
360 | struct buffer_head *bh = NULL; | 360 | struct buffer_head *bh = NULL; |
@@ -626,7 +626,7 @@ struct ext3_xattr_block_find { | |||
626 | struct buffer_head *bh; | 626 | struct buffer_head *bh; |
627 | }; | 627 | }; |
628 | 628 | ||
629 | int | 629 | static int |
630 | ext3_xattr_block_find(struct inode *inode, struct ext3_xattr_info *i, | 630 | ext3_xattr_block_find(struct inode *inode, struct ext3_xattr_info *i, |
631 | struct ext3_xattr_block_find *bs) | 631 | struct ext3_xattr_block_find *bs) |
632 | { | 632 | { |
@@ -859,7 +859,7 @@ struct ext3_xattr_ibody_find { | |||
859 | struct ext3_iloc iloc; | 859 | struct ext3_iloc iloc; |
860 | }; | 860 | }; |
861 | 861 | ||
862 | int | 862 | static int |
863 | ext3_xattr_ibody_find(struct inode *inode, struct ext3_xattr_info *i, | 863 | ext3_xattr_ibody_find(struct inode *inode, struct ext3_xattr_info *i, |
864 | struct ext3_xattr_ibody_find *is) | 864 | struct ext3_xattr_ibody_find *is) |
865 | { | 865 | { |