Merge tag 'upstream/8.21'

Upstream version 8.21

1 files changed, 26 insertions, 3 deletions

diff --git a/src/stat.c b/src/stat.c
index c6747a6b..dd210d18 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -1,5 +1,5 @@
 /* stat.c -- display file or file system status
-   Copyright (C) 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2013 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
@@ -126,7 +126,11 @@ statfs (char const *filename, struct fs_info *buf)
 # else
 #  define STRUCT_STATVFS struct statfs
 #  define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATFS_F_FSID_IS_INTEGER
-#  define STATFS_FRSIZE(S) 0
+#  if HAVE_STRUCT_STATFS_F_FRSIZE
+#   define STATFS_FRSIZE(S) ((S)->f_frsize)
+#  else
+#   define STATFS_FRSIZE(S) 0
+#  endif
 # endif
 #endif
 
@@ -245,6 +249,11 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "afs";
     case S_MAGIC_ANON_INODE_FS: /* 0x09041934 local */
       return "anon-inode FS";
+    case S_MAGIC_AUFS: /* 0x61756673 remote */
+      /* FIXME: change syntax or add an optional attribute like "inotify:no".
+         The above is labeled as "remote" so that tail always uses polling,
+         but this isn't really a remote file system type.  */
+      return "aufs";
     case S_MAGIC_AUTOFS: /* 0x0187 local */
       return "autofs";
     case S_MAGIC_BEFS: /* 0x42465331 local */
@@ -257,6 +266,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "binfmt_misc";
     case S_MAGIC_BTRFS: /* 0x9123683E local */
       return "btrfs";
+    case S_MAGIC_CEPH: /* 0x00C36400 remote */
+      return "ceph";
     case S_MAGIC_CGROUP: /* 0x0027E0EB local */
       return "cgroupfs";
     case S_MAGIC_CIFS: /* 0xFF534D42 remote */
@@ -353,6 +364,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "openprom";
     case S_MAGIC_OCFS2: /* 0x7461636f remote */
       return "ocfs2";
+    case S_MAGIC_PANFS: /* 0xAAD7AAEA remote */
+      return "panfs";
     case S_MAGIC_PIPEFS: /* 0x50495045 remote */
       /* FIXME: change syntax or add an optional attribute like "inotify:no".
          The above is labeled as "remote" so that tail always uses polling,
@@ -402,8 +415,12 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "usbdevfs";
     case S_MAGIC_V9FS: /* 0x01021997 local */
       return "v9fs";
+    case S_MAGIC_VMHGFS: /* 0xBACBACBC remote */
+      return "vmhgfs";
     case S_MAGIC_VXFS: /* 0xA501FCF5 local */
       return "vxfs";
+    case S_MAGIC_VZFS: /* 0x565A4653 local */
+      return "vzfs";
     case S_MAGIC_XENFS: /* 0xABBA1974 local */
       return "xenfs";
     case S_MAGIC_XENIX: /* 0x012FF7B4 local */
@@ -412,6 +429,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
       return "xfs";
     case S_MAGIC_XIAFS: /* 0x012FD16D local */
       return "xia";
+    case S_MAGIC_ZFS: /* 0x2FC12FC1 local */
+      return "zfs";
 
 # elif __GNU__
     case FSTYPE_UFS:
@@ -1330,7 +1349,11 @@ usage (int status)
       printf (_("Usage: %s [OPTION]... FILE...\n"), program_name);
       fputs (_("\
 Display file or file system status.\n\
-\n\
+"), stdout);
+
+      emit_mandatory_arg_note ();
+
+      fputs (_("\
   -L, --dereference     follow links\n\
   -f, --file-system     display file system status instead of file status\n\
 "), stdout);