[Ocfs2-tools-commits] manish commits r970 - trunk/ocfs2console/ocfs2interface

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-06-21 16:25:33 -0500 (Tue, 21 Jun 2005)
New Revision: 970

Modified:
   trunk/ocfs2console/ocfs2interface/ocfsplist.c
Log:
If ocfs2_check_mount_point returns an error, don't trust the results
at all.


Modified: trunk/ocfs2console/ocfs2interface/ocfsplist.c
===================================================================
--- trunk/ocfs2console/ocfs2interface/ocfsplist.c	2005-06-21 21:12:27 UTC (rev 969)
+++ trunk/ocfs2console/ocfs2interface/ocfsplist.c	2005-06-21 21:25:33 UTC (rev 970)
@@ -310,18 +310,19 @@
 		info.mountpoint = mountpoint;
 	      else
 		info.mountpoint = NULL;
-	    }
-	  else
-	    info.mountpoint = NULL;
 
-	  if (wdata->unmounted)
-	    {
-	      if ((info.mountpoint == NULL) && !used_unmounted (info.fstype) &&
-		  !(flags & OCFS2_MF_BUSY))
+	      if (wdata->unmounted)
+		{
+		  if ((info.mountpoint == NULL) &&
+		      !used_unmounted (info.fstype) &&
+		      !(flags & OCFS2_MF_BUSY))
+		    wdata->func (&info, wdata->data);
+		}
+	      else
 		wdata->func (&info, wdata->data);
 	    }
 	  else
-	    wdata->func (&info, wdata->data);
+	    info.mountpoint = NULL;
 
 	  g_free (info.fstype);
 	}