Attachment 305812 Details for Bug 447076 – nash-6.0.19-stat-less.patch

[patch] nash-6.0.19-stat-less.patch

0001-Avoid-doing-lstat-when-readdir-already-gave-us-t.patch (text/plain), 1.80 KB, created by Adam Jackson on 2008-05-17 17:34:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2008-05-17 17:34:19 UTC

Size: 1.80 KB

patch

obsolete

>From e4575e45facb1bd891380f51b51bdc497f937999 Mon Sep 17 00:00:00 2001
>From: Adam Jackson <ajax@redhat.com>
>Date: Sat, 17 May 2008 13:32:39 -0400
>Subject: [PATCH] Avoid doing lstat() when readdir() already gave us the answer.
>
>---
> nash/devtree.c |    4 +---
> nash/nash.c    |   13 ++++++-------
> 2 files changed, 7 insertions(+), 10 deletions(-)
>
>diff --git a/nash/devtree.c b/nash/devtree.c
>index 6ced12d..1de16bb 100644
>--- a/nash/devtree.c
>+++ b/nash/devtree.c
>@@ -1136,7 +1136,6 @@ static int is_sysfs_slave(struct nash_dev_node *adult,
> {
>     DIR *dir;
>     struct dirent *entry;
>-    struct stat sb;
>     int rc = 0;
>     char slaves[strlen(child->bdev->sysfs_path) + strlen("/slaves") + 1];
> 
>@@ -1159,8 +1158,7 @@ static int is_sysfs_slave(struct nash_dev_node *adult,
>         strcpy(devpath, slave);
>         strcat(devpath, "/dev");
> 
>-        lstat(slave, &sb);
>-        if (!S_ISLNK(sb.st_mode))
>+        if (entry.d_type == DT_LNK)
>             continue;
> 
>         if (!(df = fopen(devpath, "r")))
>diff --git a/nash/nash.c b/nash/nash.c
>index 3c123ab..2d20f12 100644
>--- a/nash/nash.c
>+++ b/nash/nash.c
>@@ -1052,14 +1052,13 @@ recursiveRemove(char * dirName)
>         strcat(strBuf, "/");
>         strcat(strBuf, d->d_name);
> 
>-        if (lstat(strBuf, &sb)) {
>-            eprintf("failed to stat %s: %m\n", strBuf);
>-            errno = 0;
>-            continue;
>-        }
>-
>         /* only descend into subdirectories if device is same as dir */
>-        if (S_ISDIR(sb.st_mode)) {
>+        if (d->d_type == DT_DIR) {
>+            if (lstat(strBuf, &sb)) {
>+                eprintf("failed to stat %s: %m\n", strBuf);
>+                errno = 0;
>+                continue;
>+            }
>             if (sb.st_dev == rb.st_dev) {
>                 recursiveRemove(strBuf);
>                 if (rmdir(strBuf))
>-- 
>1.5.4.5
>

Actions: View | Diff

Attachments on bug 447076: 305812