Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: clean up some compiler warnings

diff --combined fs/jfs/namei.c
index 29b1f1a21142d773d9fe0ec783745cc82cd2a21b,45e5c6f65b2cf77175b4536c1dbb3e055a77862c..e17545e15664d77cf5d3af35c2c34c99123b929d
--- 1/fs/jfs/namei.c
--- 2/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@@ -893,7 -893,7 +893,7 @@@ static int jfs_symlink(struct inode *di
        unchar *i_fastsymlink;
        s64 xlen = 0;
        int bmask = 0, xsize;
-       s64 extent = 0, xaddr;
+       s64 xaddr;
        struct metapage *mp;
        struct super_block *sb;
        struct tblock *tblk;
@@@ -993,7 -993,6 +993,6 @@@
                        txAbort(tid, 0);
                        goto out3;
                }
-               extent = xaddr;
                ip->i_size = ssize - 1;
                while (ssize) {
                        /* This is kind of silly since PATH_MAX == 4K */
@@@ -1537,7 -1536,7 +1536,7 @@@ const struct inode_operations jfs_dir_i
        .removexattr    = jfs_removexattr,
        .setattr        = jfs_setattr,
  #ifdef CONFIG_JFS_POSIX_ACL
 -      .check_acl      = jfs_check_acl,
 +      .get_acl        = jfs_get_acl,
  #endif
  };