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

[firefly-linux-kernel-4.4.55.git] / fs / jffs2 / xattr.c

diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c
index c4dd342d13a703966910057faaa0bdd1ed3f6bbb..f092fee5be50511f643e9fac79c03d393cef18f2 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;
@@ -1266,7 +1266,6 @@ int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_
        if (rc) {
                JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n",
                              __func__, rc, totlen);
-               rc = rc ? rc : -EBADFD;
                goto out;
        }
        rc = save_xattr_ref(c, ref);