@@ -34,6 +34,7 @@ extern char *progname;
int fs_count;
struct fs_path *fs_table;
struct fs_path *fs_path;
+int xfs_fs_count;
char *mtab_file;
#define PROC_MOUNTS "/proc/self/mounts"
@@ -138,7 +139,16 @@ fs_table_insert(
goto out_norealloc;
fs_table = tmp_fs_table;
- fs_path = &fs_table[fs_count];
+ /* Put foreign filesystems at the end, xfs filesystems at the front */
+ if (flags & FS_FOREIGN || fs_count == 0) {
+ fs_path = &fs_table[fs_count];
+ } else {
+ /* move foreign fs entries down, insert new one just before */
+ memmove(&fs_table[xfs_fs_count], &fs_table[xfs_fs_count - 1],
+ sizeof(fs_path_t)*(fs_count - xfs_fs_count + 1));
+ fs_path = &fs_table[xfs_fs_count];
+ xfs_fs_count++;
+ }
fs_path->fs_dir = dir;
fs_path->fs_prid = prid;
fs_path->fs_flags = flags;
@@ -75,9 +75,15 @@ static int
pathlist_f(void)
{
int i;
+ struct fs_path *path;
- for (i = 0; i < fs_count; i++)
- printpath(&fs_table[i], i, 1, &fs_table[i] == fs_path);
+ for (i = 0; i < fs_count; i++) {
+ path = &fs_table[i];
+ /* Table is ordered xfs first, then foreign */
+ if (path->fs_flags & FS_FOREIGN && !foreign_allowed)
+ break;
+ printpath(path, i, 1, path == fs_path);
+ }
return 0;
}
@@ -98,7 +104,7 @@ path_f(
int argc,
char **argv)
{
- int i;
+ int i;
if (fs_count == 0) {
printf(_("No paths are available\n"));
@@ -113,8 +119,13 @@ path_f(
printf(_("value %d is out of range (0-%d)\n"),
i, fs_count-1);
} else {
- fs_path = &fs_table[i];
- pathlist_f();
+ for (i = 0; i < fs_count; i++) {
+ fs_path = &fs_table[i];
+ /* Table is ordered xfs first, then foreign */
+ if (fs_path->fs_flags & FS_FOREIGN && !foreign_allowed)
+ break;
+ pathlist_f();
+ }
}
return 0;
}
Commits b20b6c2 and 29647c8 modified xfs_quota for use on non-XFS filesystems. Modifications to fs_initialise_mounts (paths.c) resulted in an xfstest fail (xfs/261), due to foreign fs paths being picked up first from the fs table. The xfs_quota print command then complained about not being able to print the foreign paths, instead of previous behavior (quiet). This patch restores correct behavior, sorting the table so that xfs entries are first, followed by foreign fs entries. The patch maintains the order of xfs entries and foreign entries in the same order as mtab entries. Signed-off-by: Bill O'Donnell <billodo@redhat.com> --- libxcmd/paths.c | 12 +++++++++++- quota/path.c | 21 ++++++++++++++++----- 2 files changed, 27 insertions(+), 6 deletions(-)