Commit d406f66d authored Jul 29, 2008 by Harvey Harrison Committed by Linus Torvalds Jul 30, 2008

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>

parent 32be1d22

fs/omfs/bitmap.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -71,10 +71,10 @@ static int set_run(struct super_block *sb, int map,
		}
		if (set) {
		set_bit(bit, sbi->s_imap[map]);
		set_bit(bit, (long *) bh->b_data);
		set_bit(bit, (unsigned long *)bh->b_data);
		} else {
		clear_bit(bit, sbi->s_imap[map]);
		clear_bit(bit, (long *) bh->b_data);
		clear_bit(bit, (unsigned long *)bh->b_data);
		}
		}
		mark_buffer_dirty(bh);
		@@ -109,7 +109,7 @@ int omfs_allocate_block(struct super_block *sb, u64 block)
		if (!bh)
		goto out;

		set_bit(bit, (long *) bh->b_data);
		set_bit(bit, (unsigned long *)bh->b_data);
		mark_buffer_dirty(bh);
		brelse(bh);
		}

fs/omfs/dir.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ int omfs_make_empty(struct inode inode, struct super_block sb)

		oi = (struct omfs_inode *) bh->b_data;
		oi->i_head.h_self = cpu_to_be64(inode->i_ino);
		oi->i_sibling = ~0ULL;
		oi->i_sibling = ~cpu_to_be64(0ULL);

		mark_buffer_dirty(bh);
		brelse(bh);

fs/omfs/file.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -30,11 +30,11 @@ void omfs_make_empty_table(struct buffer_head *bh, int offset)
		{
		struct omfs_extent oe = (struct omfs_extent ) &bh->b_data[offset];

		oe->e_next = ~0ULL;
		oe->e_next = ~cpu_to_be64(0ULL);
		oe->e_extent_count = cpu_to_be32(1),
		oe->e_fill = cpu_to_be32(0x22),
		oe->e_entry.e_cluster = ~0ULL;
		oe->e_entry.e_blocks = ~0ULL;
		oe->e_entry.e_cluster = ~cpu_to_be64(0ULL);
		oe->e_entry.e_blocks = ~cpu_to_be64(0ULL);
		}

		int omfs_shrink_inode(struct inode *inode)

Admin message