home *** CD-ROM | disk | FTP | other *** search
/ ftp.parl.clemson.edu / 2015-02-07.ftp.parl.clemson.edu.tar / ftp.parl.clemson.edu / pub / pvfs2 / orangefs-2.8.3-20110323.tar.gz / orangefs-2.8.3-20110323.tar / orangefs / patches / posix-ext / posix-statlite-x86_64.patch < prev    next >
Text File  |  2008-01-07  |  3KB  |  78 lines
  1. diff -Naur --exclude-from=/home/vilayann/redhat/BUILD/kernel-2.6.16/exclude vanilla/arch/x86_64/ia32/sys_ia32.c vanilla-new/arch/x86_64/ia32/sys_ia32.c
  2. --- vanilla/arch/x86_64/ia32/sys_ia32.c    2006-05-09 18:53:48.000000000 -0500
  3. +++ vanilla-new/arch/x86_64/ia32/sys_ia32.c    2006-05-18 20:35:24.000000000 -0500
  4. @@ -234,13 +234,13 @@
  5.               return -EFAULT;
  6.      }
  7.      if (SLITE_MTIME(stat_lite->lite_mask)) {
  8. -        if (__put_user (stat->mtime.tv_sec, &ubuf->st_mtime) ||
  9. -             __put_user (stat->mtime.tv_nsec, &ubuf->st_mtime_nsec))
  10. +        if (__put_user (stat_lite->mtime.tv_sec, &ubuf->st_mtime) ||
  11. +             __put_user (stat_lite->mtime.tv_nsec, &ubuf->st_mtime_nsec))
  12.               return -EFAULT;
  13.      }
  14.      if (SLITE_CTIME(stat_lite->lite_mask)) {
  15. -        if (__put_user (stat->ctime.tv_sec, &ubuf->st_ctime) ||
  16. -             __put_user (stat->ctime.tv_nsec, &ubuf->st_ctime_nsec))
  17. +        if (__put_user (stat_lite->ctime.tv_sec, &ubuf->st_ctime) ||
  18. +             __put_user (stat_lite->ctime.tv_nsec, &ubuf->st_ctime_nsec))
  19.               return -EFAULT;
  20.      }
  21.      if (SLITE_BLKSIZE(stat_lite->lite_mask)) {
  22. @@ -248,7 +248,7 @@
  23.               return -EFAULT;
  24.      }
  25.      if (SLITE_BLOCKS(stat_lite->lite_mask)) {
  26. -         if (__put_user (stat->blocks, &ubuf->st_blocks))
  27. +         if (__put_user (stat_lite->blocks, &ubuf->st_blocks))
  28.              return -EFAULT;
  29.      }
  30.      return 0;
  31. diff -Naur --exclude-from=/home/vilayann/redhat/BUILD/kernel-2.6.16/exclude vanilla/include/asm-x86_64/ia32.h vanilla-new/include/asm-x86_64/ia32.h
  32. --- vanilla/include/asm-x86_64/ia32.h    2006-03-19 23:53:29.000000000 -0600
  33. +++ vanilla-new/include/asm-x86_64/ia32.h    2006-05-18 20:34:22.000000000 -0500
  34. @@ -78,6 +78,43 @@
  35.      unsigned long long    st_ino;
  36.  } __attribute__((packed));
  37.  
  38. +/* This matches struct stat64_lite in glibc2.2, hence the absolutely
  39. + * insane amounts of padding around dev_t's.
  40. + */
  41. +struct stat64_lite {
  42. +    unsigned long long    st_dev;
  43. +    unsigned char        __pad0[4];
  44. +
  45. +#define STAT64_HAS_BROKEN_ST_INO    1
  46. +    unsigned int        __st_ino;
  47. +
  48. +    unsigned int        st_mode;
  49. +    unsigned int        st_nlink;
  50. +
  51. +    unsigned int        st_uid;
  52. +    unsigned int        st_gid;
  53. +
  54. +    unsigned long long    st_rdev;
  55. +    unsigned char        __pad3[4];
  56. +
  57. +    unsigned long  st_litemask;
  58. +    unsigned char  __pad5[4];
  59. +
  60. +    long long        st_size;
  61. +    unsigned int        st_blksize;
  62. +
  63. +    long long        st_blocks;/* Number 512-byte blocks allocated. */
  64. +
  65. +    unsigned         st_atime;
  66. +    unsigned         st_atime_nsec;
  67. +    unsigned         st_mtime;
  68. +    unsigned         st_mtime_nsec;
  69. +    unsigned         st_ctime;
  70. +    unsigned         st_ctime_nsec;
  71. +
  72. +    unsigned long long    st_ino;
  73. +} __attribute__((packed));
  74. +
  75.  typedef struct compat_siginfo{
  76.      int si_signo;
  77.      int si_errno;
  78.