diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 12:26:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 12:26:39 -0400 |
commit | 5fd00b031530cc476240f654c078c930f1dcd6ea (patch) | |
tree | 1673effc8eb32932cdcbbd211d4632a80e5693a0 /fs/jfs/namei.c | |
parent | 333c066bb76f1f270ca77f16afe198e54e352c83 (diff) | |
parent | 3c2c22628599006047781946b317a16d9ff3883d (diff) |
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/namei.c')
-rw-r--r-- | fs/jfs/namei.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 29b1f1a21142..e17545e15664 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c | |||
@@ -893,7 +893,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, | |||
893 | unchar *i_fastsymlink; | 893 | unchar *i_fastsymlink; |
894 | s64 xlen = 0; | 894 | s64 xlen = 0; |
895 | int bmask = 0, xsize; | 895 | int bmask = 0, xsize; |
896 | s64 extent = 0, xaddr; | 896 | s64 xaddr; |
897 | struct metapage *mp; | 897 | struct metapage *mp; |
898 | struct super_block *sb; | 898 | struct super_block *sb; |
899 | struct tblock *tblk; | 899 | struct tblock *tblk; |
@@ -993,7 +993,6 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, | |||
993 | txAbort(tid, 0); | 993 | txAbort(tid, 0); |
994 | goto out3; | 994 | goto out3; |
995 | } | 995 | } |
996 | extent = xaddr; | ||
997 | ip->i_size = ssize - 1; | 996 | ip->i_size = ssize - 1; |
998 | while (ssize) { | 997 | while (ssize) { |
999 | /* This is kind of silly since PATH_MAX == 4K */ | 998 | /* This is kind of silly since PATH_MAX == 4K */ |