From: Christoph Hellwig <hch@lst.de>
Date: Wed, 4 Feb 2009 08:34:20 +0000 (+0100)
Subject: xfs: tiny cleanup for xfs_link
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cb3f35bb3bf0759e00cd4f68155da9b636421f84;p=mv-sheeva.git

xfs: tiny cleanup for xfs_link

The source and target inodes are guaranteed to never be the same by the VFS,
so no need to check for that (and we would get into bad trouble later anyway
if that were the case).  Also clean up the error handling to use two gotos
instead of nested conditions.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Felix Blyakher <felixb@sgi.com>
---

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 0e55c5d7db5..4229408664e 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -2004,8 +2004,10 @@ xfs_link(
 	/* Return through std_return after this point. */
 
 	error = XFS_QM_DQATTACH(mp, sip, 0);
-	if (!error && sip != tdp)
-		error = XFS_QM_DQATTACH(mp, tdp, 0);
+	if (error)
+		goto std_return;
+
+	error = XFS_QM_DQATTACH(mp, tdp, 0);
 	if (error)
 		goto std_return;