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

[pandora-kernel.git] / fs / jffs2 / xattr.c

diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c
index d279fb4..f092fee 100644 (file)
--- a/fs/jffs2/xattr.c
+++ b/fs/jffs2/xattr.c
@@ -195,7 +195,7 @@ static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_dat
        /* unchecked xdatum is chained with c->xattr_unchecked */
        list_del_init(&xd->xindex);
 
-       dbg_xattr("success on verfying xdatum (xid=%u, version=%u)\n",
+       dbg_xattr("success on verifying xdatum (xid=%u, version=%u)\n",
                  xd->xid, xd->version);
 
        return 0;
@@ -960,7 +960,7 @@ static const struct xattr_handler *xprefix_to_handler(int xprefix) {
 
 ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
 {
-       struct inode *inode = dentry->d_inode;
+       struct inode *inode = d_inode(dentry);
        struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
        struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
        struct jffs2_inode_cache *ic = f->inocache;