From 9058586622aa00da03089e1645ecb60e10e3339b Mon Sep 17 00:00:00 2001 From: Dmitri Vorobiev Date: Fri, 25 Jul 2008 19:44:52 -0700 Subject: [PATCH] --- yaml --- r: 106153 b: refs/heads/master c: 75b25b4cabb7ce956c36442bf8225659b1864866 h: refs/heads/master i: 106151: 7f335d0c3ccafd4651e0b84c8314f22c835f59d1 v: v3 --- [refs] | 2 +- trunk/fs/bfs/bfs.h | 4 ++-- trunk/fs/bfs/inode.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 48c9aee8bc8a..c3210852506c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d135a5d50a08bbc53b189d79d8bdb03136f5303 +refs/heads/master: 75b25b4cabb7ce956c36442bf8225659b1864866 diff --git a/trunk/fs/bfs/bfs.h b/trunk/fs/bfs/bfs.h index 70f5d3a8eede..d1a6cd10afce 100644 --- a/trunk/fs/bfs/bfs.h +++ b/trunk/fs/bfs/bfs.h @@ -16,8 +16,8 @@ struct bfs_sb_info { unsigned long si_freei; unsigned long si_lf_eblk; unsigned long si_lasti; - unsigned long * si_imap; - struct buffer_head * si_sbh; /* buffer header w/superblock */ + unsigned long *si_imap; + struct buffer_head *si_sbh; /* buffer header w/superblock */ }; /* diff --git a/trunk/fs/bfs/inode.c b/trunk/fs/bfs/inode.c index 8db623838b50..c8b3982e11ca 100644 --- a/trunk/fs/bfs/inode.c +++ b/trunk/fs/bfs/inode.c @@ -380,7 +380,7 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent) struct bfs_inode *di; int block = (i - BFS_ROOT_INO) / BFS_INODES_PER_BLOCK + 1; int off = (i - BFS_ROOT_INO) % BFS_INODES_PER_BLOCK; - unsigned long sblock, eblock; + unsigned long eblock; if (!off) { brelse(bh); @@ -399,7 +399,6 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent) set_bit(i, info->si_imap); info->si_freeb -= BFS_FILEBLOCKS(di); - sblock = le32_to_cpu(di->i_sblock); eblock = le32_to_cpu(di->i_eblock); if (eblock > info->si_lf_eblk) info->si_lf_eblk = eblock;