src/patches/glibc/glibc-rh712248.patch

   1 2011-07-07  Ulrich Drepper  <drepper@gmail.com>
   2
   3         [BZ #12868]
   4         * sysdeps/unix/sysv/linux/linux_fsinfo.h: Define Lustre constants.
   5         * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
   6         Handle Lustre.
   7         * sysdeps/unix/sysv/linux/pathconf.c (__statfs_link_max): Likewise.
   8         (__statfs_filesize_max): Likewise.
   9         Patch mostly by Andreas Dilger <adilger@whamcloud.com>.
  10
  11 Index: glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/internal_statvfs.c
  12 ===================================================================
  13 --- glibc-2.12-2-gc4ccff1.orig/sysdeps/unix/sysv/linux/internal_statvfs.c
  14 +++ glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/internal_statvfs.c
  15 @@ -109,6 +109,9 @@ __statvfs_getflags (const char *name, in
  16      case LOGFS_MAGIC_U32:
  17        fsname = "logfs";
  18        break;
  19 +    case LUSTRE_SUPER_MAGIC:
  20 +      fsname = "lustre";
  21 +      break;
  22      }
  23
  24    FILE *mtab = __setmntent ("/proc/mounts", "r");
  25 Index: glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/linux_fsinfo.h
  26 ===================================================================
  27 --- glibc-2.12-2-gc4ccff1.orig/sysdeps/unix/sysv/linux/linux_fsinfo.h
  28 +++ glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/linux_fsinfo.h
  29 @@ -77,6 +77,9 @@
  30  /* Constant that identifies the `logfs´ filesystem.  */
  31  #define LOGFS_MAGIC_U32                0xc97e8168u
  32
  33 +/* Constant that identifies the `lustre' filesystem.  */
  34 +#define LUSTRE_SUPER_MAGIC     0x0BD00BD0
  35 +
  36  /* Constants that identify the `minix2' filesystem.  */
  37  #define MINIX2_SUPER_MAGIC     0x2468
  38  #define MINIX2_SUPER_MAGIC2    0x2478
  39 @@ -144,6 +147,8 @@
  40  /* Maximum link counts.  */
  41  #define COH_LINK_MAX           10000
  42  #define EXT2_LINK_MAX          32000
  43 +#define EXT4_LINK_MAX          65000
  44 +#define LUSTRE_LINK_MAX                EXT4_LINK_MAX
  45  #define MINIX2_LINK_MAX                65530
  46  #define MINIX_LINK_MAX         250
  47  #define REISERFS_LINK_MAX      64535
  48 Index: glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/pathconf.c
  49 ===================================================================
  50 --- glibc-2.12-2-gc4ccff1.orig/sysdeps/unix/sysv/linux/pathconf.c
  51 +++ glibc-2.12-2-gc4ccff1/sysdeps/unix/sysv/linux/pathconf.c
  52 @@ -104,6 +104,9 @@ __statfs_link_max (int result, const str
  53      case XFS_SUPER_MAGIC:
  54        return XFS_LINK_MAX;
  55
  56 +    case LUSTRE_SUPER_MAGIC:
  57 +      return LUSTRE_LINK_MAX;
  58 +
  59      default:
  60        return LINUX_LINK_MAX;
  61      }
  62 @@ -136,6 +139,7 @@ __statfs_filesize_max (int result, const
  63      case UDF_SUPER_MAGIC:
  64      case JFS_SUPER_MAGIC:
  65      case VXFS_SUPER_MAGIC:
  66 +    case LUSTRE_SUPER_MAGIC:
  67        return 64;
  68
  69      case MSDOS_SUPER_MAGIC: