diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-02-11 12:26:14 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-02-13 18:41:01 +0100 |
| commit | 982504452d60a87632a5a2f11d1be645e06d8346 (patch) | |
| tree | 648357f7b4178fc1f11aa4f1f1d4052eccbac25c | |
| parent | 48cae1e8642684f0103848b84d5884d1ba2412c8 (diff) | |
| download | coreutils-982504452d60a87632a5a2f11d1be645e06d8346.tar.xz | |
du,chgrp,chmod,chown: use FTS_DEFER_STAT
* src/du.c (main): Use FTS_DEFER_STAT, for better locality of inode
reference. Important when traversing file systems with fake inodes.
* src/chgrp.c (main): Likewise.
* src/chmod.c (main): Likewise.
* src/chown.c (main): Likewise.
The only remaining fts client, chcon, doesn't need this, since it goes
further and uses FTS_NOSTAT, which suppresses all non- directory
stat calls.
| -rw-r--r-- | src/chgrp.c | 3 | ||||
| -rw-r--r-- | src/chmod.c | 5 | ||||
| -rw-r--r-- | src/chown.c | 3 | ||||
| -rw-r--r-- | src/du.c | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/chgrp.c b/src/chgrp.c index db83c59df..0653a9033 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -1,5 +1,5 @@ /* chgrp -- change group ownership of files - Copyright (C) 89, 90, 91, 1995-2008 Free Software Foundation, Inc. + Copyright (C) 89, 90, 91, 1995-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -302,6 +302,7 @@ main (int argc, char **argv) quote ("/")); } + bit_flags |= FTS_DEFER_STAT; ok = chown_files (argv + optind, bit_flags, (uid_t) -1, gid, (uid_t) -1, (gid_t) -1, &chopt); diff --git a/src/chmod.c b/src/chmod.c index 8c5cc3e49..91dfbc3aa 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -1,5 +1,5 @@ /* chmod -- change permission modes of files - Copyright (C) 89, 90, 91, 1995-2008 Free Software Foundation, Inc. + Copyright (C) 89, 90, 91, 1995-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -534,7 +534,8 @@ main (int argc, char **argv) root_dev_ino = NULL; } - ok = process_files (argv + optind, FTS_COMFOLLOW | FTS_PHYSICAL); + ok = process_files (argv + optind, + FTS_COMFOLLOW | FTS_PHYSICAL | FTS_DEFER_STAT); exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); } diff --git a/src/chown.c b/src/chown.c index 972b281af..00cdb242b 100644 --- a/src/chown.c +++ b/src/chown.c @@ -1,5 +1,5 @@ /* chown -- change user and group ownership of files - Copyright (C) 89, 90, 91, 1995-2008 Free Software Foundation, Inc. + Copyright (C) 89, 90, 91, 1995-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -326,6 +326,7 @@ main (int argc, char **argv) quote ("/")); } + bit_flags |= FTS_DEFER_STAT; ok = chown_files (argv + optind, bit_flags, uid, gid, required_uid, required_gid, &chopt); @@ -1,5 +1,5 @@ /* du -- summarize disk usage - Copyright (C) 1988-1991, 1995-2008 Free Software Foundation, Inc. + Copyright (C) 1988-1991, 1995-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -660,7 +660,7 @@ main (int argc, char **argv) char *files_from = NULL; /* Bit flags that control how fts works. */ - int bit_flags = FTS_TIGHT_CYCLE_CHECK; + int bit_flags = FTS_TIGHT_CYCLE_CHECK | FTS_DEFER_STAT; /* Select one of the three FTS_ options that control if/when to follow a symlink. */ |