1 files changed, 13 insertions, 3 deletions

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 320b0fef249a..3ee410fc047a 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -120,16 +120,26 @@ int mkdir_p(char *path, mode_t mode)
 int rm_rf(const char *path)
 {
         DIR *dir;
-        int ret = 0;
+        int ret;
         struct dirent *d;
         char namebuf[PATH_MAX];
+        struct stat statbuf;
 
+        /* Do not fail if there's no file. */
+        ret = lstat(path, &statbuf);
+        if (ret)
+                return 0;
+
+        /* Try to remove any file we get. */
+        if (!(statbuf.st_mode & S_IFDIR))
+                return unlink(path);
+
+        /* We have directory in path. */
         dir = opendir(path);
         if (dir == NULL)
-                return 0;
+                return -1;
 
         while ((d = readdir(dir)) != NULL && !ret) {
-                struct stat statbuf;
 
                 if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
                         continue;