diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 09:26:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 09:26:39 -0700 |
commit | 5fd00b031530cc476240f654c078c930f1dcd6ea (patch) | |
tree | 1673effc8eb32932cdcbbd211d4632a80e5693a0 /fs/jfs/jfs_dmap.c | |
parent | 333c066bb76f1f270ca77f16afe198e54e352c83 (diff) | |
parent | 3c2c22628599006047781946b317a16d9ff3883d (diff) | |
download | blackbird-op-linux-5fd00b031530cc476240f654c078c930f1dcd6ea.tar.gz blackbird-op-linux-5fd00b031530cc476240f654c078c930f1dcd6ea.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
jfs: clean up some compiler warnings
Diffstat (limited to 'fs/jfs/jfs_dmap.c')
-rw-r--r-- | fs/jfs/jfs_dmap.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index 4496872cf4e7..9cbd11a3f804 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -3161,7 +3161,7 @@ static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno, { int rc; int dbitno, word, rembits, nb, nwords, wbitno, agno; - s8 oldroot, *leaf; + s8 oldroot; struct dmaptree *tp = (struct dmaptree *) & dp->tree; /* save the current value of the root (i.e. maximum free string) @@ -3169,9 +3169,6 @@ static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno, */ oldroot = tp->stree[ROOT]; - /* pick up a pointer to the leaves of the dmap tree */ - leaf = tp->stree + LEAFIND; - /* determine the bit number and word within the dmap of the * starting block. */ |