[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/io
From:       David Faure <faure () kde ! org>
Date:       2010-11-25 13:47:42
Message-ID: 20101125134742.24546AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1200681 by dfaure:

Revert: it's perfectly valid to mount the same thing twice, e.g. with mount --bind:
/d on /home/dfaure/bind_d type none (rw,bind)
/d on /home/dfaure/bind_d2 type none (rw,bind)
I'll have to fix the unittest instead.


 M  +0 -14     kmountpoint.cpp  


--- trunk/KDE/kdelibs/kdecore/io/kmountpoint.cpp #1200680:1200681
@@ -290,10 +290,6 @@
 {
     KMountPoint::List result;
 
-    // In weird cases we can get two entries for the same mountpoint, e.g. in a chroot
-    // /proc can show up as being mounted twice (weird...). We just keep the first entry.
-    QSet<QString> seen_mountPoints;
-
 #ifdef HAVE_GETMNTINFO
 
 #ifdef GETMNTINFO_USES_STATVFS
@@ -329,12 +325,8 @@
 
       mp->d->finalizeCurrentMountPoint(infoNeeded);
       // TODO: Strip trailing '/' ?
-
-      if (!seen_mountPoints.contains(mp->d->mountedFrom)) {
-          seen_mountPoints.insert(mp->d->mountedFrom);
           result.append(mp);
       }
-   }
 
 #elif defined(_AIX)
 
@@ -392,10 +384,7 @@
             }
 
             mp->d->finalizeCurrentMountPoint(infoNeeded);
-            if (!seen_mountPoints.contains(mp->d->mountedFrom)) {
-                seen_mountPoints.insert(mp->d->mountedFrom);
                 result.append(mp);
-            }
 
             /* goto the next vmount structure: */
             vm = (struct vmount *)((char *)vm + vm->vmt_length);
@@ -449,11 +438,8 @@
       }
       mp->d->finalizeCurrentMountPoint(infoNeeded);
 
-      if (!seen_mountPoints.contains(mp->d->mountedFrom)) {
-          seen_mountPoints.insert(mp->d->mountedFrom);
           result.append(mp);
       }
-   }
    ENDMNTENT(mnttab);
 #endif
    return result;
[prev in list] [next in list] [prev in thread] [next in thread]