]> git.hungrycats.org Git - linux/commitdiff
xfs: fix up backport error in fs/xfs/xfs_inode.c
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Jun 2016 05:19:10 +0000 (22:19 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Jun 2016 17:15:29 +0000 (10:15 -0700)
Commit c66edeaf79bb6f0ca688ffec9ca50a61b7569984, which was a backport of
commit b1438f477934f5a4d5a44df26f3079a7575d5946 upstream, needed to have
the error value be positive, not negative, in order to work properly.

Reported-by: "Thomas D." <whissi@whissi.de>
Reported-by: Brad Spender <spender@grsecurity.net>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Willy Tarreau <w@1wt.eu>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/xfs/xfs_inode.c

index fb8579d35cd40250c8a79ebc52ae8a76eebdfb06..47533013a7720247423bfc20130c50971be911ce 100644 (file)
@@ -3098,7 +3098,7 @@ xfs_iflush(
         */
        error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK,
                               0);
-       if (error == -EAGAIN) {
+       if (error == EAGAIN) {
                xfs_ifunlock(ip);
                return error;
        }