From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754637AbcHUPuV (ORCPT ); Sun, 21 Aug 2016 11:50:21 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:55786 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754345AbcHUPeu (ORCPT ); Sun, 21 Aug 2016 11:34:50 -0400 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Dave Chinner , Willy Tarreau , Jiri Slaby Subject: [PATCH 3.10 100/180] xfs: fix up backport error in fs/xfs/xfs_inode.c Date: Sun, 21 Aug 2016 17:30:30 +0200 Message-Id: <1471793510-13022-101-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1471793510-13022-1-git-send-email-w@1wt.eu> References: <1471793510-13022-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman commit 032ac851fd42a62717032a594ac319f8a76b8a7d upstream. 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." Reported-by: Brad Spender Cc: Dave Chinner Cc: Willy Tarreau Cc: Jiri Slaby Signed-off-by: Greg Kroah-Hartman Signed-off-by: Willy Tarreau --- fs/xfs/xfs_inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 130881e..06dec55 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2779,7 +2779,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; } -- 2.8.0.rc2.1.gbe9624a