From: Jim Meyering <jim@meyering.net>
Date: Sun, 12 Mar 2006 22:21:05 +0000 (+0000)
Subject: (AD_pop_and_chdir): Use new macro,
X-Git-Tag: v6.0~605
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0c89246d001217064ee93c9f764e9d27e424db5;p=thirdparty%2Fcoreutils.git

(AD_pop_and_chdir): Use new macro,
CYCLE_CHECK_REFLECT_CHDIR_UP, rather than open-coding it.
---

diff --git a/src/remove.c b/src/remove.c
index cf46fd2c9e..bfb8a39b9b 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -411,8 +411,8 @@ AD_pop_and_chdir (DIR **dirp, Dirstack_state *ds, char **prev_dir)
      could be reused in the creation (by some other process)
      of a directory that this rm process would encounter,
      which would result in a false-positive cycle indication.  */
-  if (SAME_INODE (ds->cycle_check_state.dev_ino, leaf_dev_ino))
-    ds->cycle_check_state.dev_ino = top->dev_ino;
+  CYCLE_CHECK_REFLECT_CHDIR_UP (&ds->cycle_check_state,
+				top->dev_ino, leaf_dev_ino);
 
   /* Propagate any failure to parent.  */
   UPDATE_STATUS (top->status, old_status);