Merge jfs@jfs.bkbits.net:linux-2.5

into shaggy.austin.ibm.com:/shaggy/bk/jfs-2.5

diff --cc fs/jfs/namei.c
index 3bf710dd090116944fbb1588d1ef762366d7f822,0593d244727226c8f1fde6dd54fe362e9aa48415..65196d513d959f31e2b8381d600bb3506277801b
--- 1/fs/jfs/namei.c
--- 2/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@@ -1372,10 -1370,10 +1372,10 @@@ int jfs_mknod(struct inode *dir, struc
  
        out:
        jfs_info("jfs_mknod: returning %d", rc);
-       return -rc;
+       return rc;
  }
  
 -static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry)
 +static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struct nameidata *nd)
  {
        struct btstack btstack;
        ino_t inum;

diff --cc fs/jfs/xattr.c
Simple merge