diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-07-30 01:33:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-30 12:41:46 -0400 |
commit | d406f66ddb0d7491ddd53e4600c425d76a8a245f (patch) | |
tree | 3f3a038ac10d0b5fa7a08acf0a5cd6e805d18e91 | |
parent | 32be1d22327743134974c7b2ec1e2a143b6b6f86 (diff) |
omfs: sparse annotations
Missing cpu_to_be64 on some constant assignments.
fs/omfs/dir.c:107:16: warning: incorrect type in assignment (different base types)
fs/omfs/dir.c:107:16: expected restricted __be64 [usertype] i_sibling
fs/omfs/dir.c:107:16: got unsigned long long
fs/omfs/file.c:33:13: warning: incorrect type in assignment (different base types)
fs/omfs/file.c:33:13: expected restricted __be64 [usertype] e_next
fs/omfs/file.c:33:13: got unsigned long long
fs/omfs/file.c:36:24: warning: incorrect type in assignment (different base types)
fs/omfs/file.c:36:24: expected restricted __be64 [usertype] e_cluster
fs/omfs/file.c:36:24: got unsigned long long
fs/omfs/file.c:37:23: warning: incorrect type in assignment (different base types)
fs/omfs/file.c:37:23: expected restricted __be64 [usertype] e_blocks
fs/omfs/file.c:37:23: got unsigned long long
fs/omfs/bitmap.c:74:18: warning: incorrect type in argument 2 (different signedness)
fs/omfs/bitmap.c:74:18: expected unsigned long volatile *addr
fs/omfs/bitmap.c:74:18: got long *<noident>
fs/omfs/bitmap.c:77:20: warning: incorrect type in argument 2 (different signedness)
fs/omfs/bitmap.c:77:20: expected unsigned long volatile *addr
fs/omfs/bitmap.c:77:20: got long *<noident>
fs/omfs/bitmap.c:112:17: warning: incorrect type in argument 2 (different signedness)
fs/omfs/bitmap.c:112:17: expected unsigned long volatile *addr
fs/omfs/bitmap.c:112:17: got long *<noident>
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/omfs/bitmap.c | 6 | ||||
-rw-r--r-- | fs/omfs/dir.c | 2 | ||||
-rw-r--r-- | fs/omfs/file.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/fs/omfs/bitmap.c b/fs/omfs/bitmap.c index dc75f22be3f2..697663b01bae 100644 --- a/fs/omfs/bitmap.c +++ b/fs/omfs/bitmap.c | |||
@@ -71,10 +71,10 @@ static int set_run(struct super_block *sb, int map, | |||
71 | } | 71 | } |
72 | if (set) { | 72 | if (set) { |
73 | set_bit(bit, sbi->s_imap[map]); | 73 | set_bit(bit, sbi->s_imap[map]); |
74 | set_bit(bit, (long *) bh->b_data); | 74 | set_bit(bit, (unsigned long *)bh->b_data); |
75 | } else { | 75 | } else { |
76 | clear_bit(bit, sbi->s_imap[map]); | 76 | clear_bit(bit, sbi->s_imap[map]); |
77 | clear_bit(bit, (long *) bh->b_data); | 77 | clear_bit(bit, (unsigned long *)bh->b_data); |
78 | } | 78 | } |
79 | } | 79 | } |
80 | mark_buffer_dirty(bh); | 80 | mark_buffer_dirty(bh); |
@@ -109,7 +109,7 @@ int omfs_allocate_block(struct super_block *sb, u64 block) | |||
109 | if (!bh) | 109 | if (!bh) |
110 | goto out; | 110 | goto out; |
111 | 111 | ||
112 | set_bit(bit, (long *) bh->b_data); | 112 | set_bit(bit, (unsigned long *)bh->b_data); |
113 | mark_buffer_dirty(bh); | 113 | mark_buffer_dirty(bh); |
114 | brelse(bh); | 114 | brelse(bh); |
115 | } | 115 | } |
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c index 05a5bc31e4bd..c0757e998876 100644 --- a/fs/omfs/dir.c +++ b/fs/omfs/dir.c | |||
@@ -104,7 +104,7 @@ int omfs_make_empty(struct inode *inode, struct super_block *sb) | |||
104 | 104 | ||
105 | oi = (struct omfs_inode *) bh->b_data; | 105 | oi = (struct omfs_inode *) bh->b_data; |
106 | oi->i_head.h_self = cpu_to_be64(inode->i_ino); | 106 | oi->i_head.h_self = cpu_to_be64(inode->i_ino); |
107 | oi->i_sibling = ~0ULL; | 107 | oi->i_sibling = ~cpu_to_be64(0ULL); |
108 | 108 | ||
109 | mark_buffer_dirty(bh); | 109 | mark_buffer_dirty(bh); |
110 | brelse(bh); | 110 | brelse(bh); |
diff --git a/fs/omfs/file.c b/fs/omfs/file.c index 66e01fae4384..7e2499053e4d 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c | |||
@@ -30,11 +30,11 @@ void omfs_make_empty_table(struct buffer_head *bh, int offset) | |||
30 | { | 30 | { |
31 | struct omfs_extent *oe = (struct omfs_extent *) &bh->b_data[offset]; | 31 | struct omfs_extent *oe = (struct omfs_extent *) &bh->b_data[offset]; |
32 | 32 | ||
33 | oe->e_next = ~0ULL; | 33 | oe->e_next = ~cpu_to_be64(0ULL); |
34 | oe->e_extent_count = cpu_to_be32(1), | 34 | oe->e_extent_count = cpu_to_be32(1), |
35 | oe->e_fill = cpu_to_be32(0x22), | 35 | oe->e_fill = cpu_to_be32(0x22), |
36 | oe->e_entry.e_cluster = ~0ULL; | 36 | oe->e_entry.e_cluster = ~cpu_to_be64(0ULL); |
37 | oe->e_entry.e_blocks = ~0ULL; | 37 | oe->e_entry.e_blocks = ~cpu_to_be64(0ULL); |
38 | } | 38 | } |
39 | 39 | ||
40 | int omfs_shrink_inode(struct inode *inode) | 40 | int omfs_shrink_inode(struct inode *inode) |