rpc/xdr: update .x files

* now, 'rpcgen $filename-xdr.x' file will result in $filename-xdr.h

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 2153 (glusterfs3.x does not match "generated" source)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2153

1 files changed, 1 insertions, 239 deletions

diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h
index 9f630c47599..4c57bfa409f 100644
--- a/rpc/xdr/src/glusterfs3-xdr.h
+++ b/rpc/xdr/src/glusterfs3-xdr.h
@@ -30,127 +30,12 @@
 
 //#include <rpc/rpc.h>
 #include "xdr-common.h"
-#include "iatt.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
-#define GF_O_ACCMODE           003
-#define GF_O_RDONLY             00
-#define GF_O_WRONLY             01
-#define GF_O_RDWR               02
-#define GF_O_CREAT            0100
-#define GF_O_EXCL             0200
-#define GF_O_NOCTTY           0400
-#define GF_O_TRUNC           01000
-#define GF_O_APPEND          02000
-#define GF_O_NONBLOCK        04000
-#define GF_O_SYNC           010000
-#define GF_O_ASYNC          020000
-
-#define GF_O_DIRECT         040000
-#define GF_O_DIRECTORY     0200000
-#define GF_O_NOFOLLOW      0400000
-#define GF_O_NOATIME      01000000
-#define GF_O_CLOEXEC      02000000
-
-#define GF_O_LARGEFILE     0100000
-
-#define XLATE_BIT(from, to, bit)    do {                \
-                if (from & bit)                         \
-                        to = to | GF_##bit;             \
-        } while (0)
-
-#define UNXLATE_BIT(from, to, bit)  do {                \
-                if (from & GF_##bit)                    \
-                        to = to | bit;                  \
-        } while (0)
-
-#define XLATE_ACCESSMODE(from, to) do {                 \
-                switch (from & O_ACCMODE) {             \
-                case O_RDONLY: to |= GF_O_RDONLY;       \
-                        break;                          \
-                case O_WRONLY: to |= GF_O_WRONLY;       \
-                        break;                          \
-                case O_RDWR: to |= GF_O_RDWR;           \
-                        break;                          \
-                }                                       \
-        } while (0)
-
-#define UNXLATE_ACCESSMODE(from, to) do {               \
-                switch (from & GF_O_ACCMODE) {          \
-                case GF_O_RDONLY: to |= O_RDONLY;       \
-                        break;                          \
-                case GF_O_WRONLY: to |= O_WRONLY;       \
-                        break;                          \
-                case GF_O_RDWR: to |= O_RDWR;           \
-                        break;                          \
-                }                                       \
-        } while (0)
-
-static inline uint32_t
-gf_flags_from_flags (uint32_t flags)
-{
-        uint32_t gf_flags = 0;
-
-        XLATE_ACCESSMODE (flags, gf_flags);
-
-        XLATE_BIT (flags, gf_flags, O_CREAT);
-        XLATE_BIT (flags, gf_flags, O_EXCL);
-        XLATE_BIT (flags, gf_flags, O_NOCTTY);
-        XLATE_BIT (flags, gf_flags, O_TRUNC);
-        XLATE_BIT (flags, gf_flags, O_APPEND);
-        XLATE_BIT (flags, gf_flags, O_NONBLOCK);
-        XLATE_BIT (flags, gf_flags, O_SYNC);
-        XLATE_BIT (flags, gf_flags, O_ASYNC);
-
-        XLATE_BIT (flags, gf_flags, O_DIRECT);
-        XLATE_BIT (flags, gf_flags, O_DIRECTORY);
-        XLATE_BIT (flags, gf_flags, O_NOFOLLOW);
-#ifdef O_NOATIME
-        XLATE_BIT (flags, gf_flags, O_NOATIME);
-#endif
-#ifdef O_CLOEXEC
-        XLATE_BIT (flags, gf_flags, O_CLOEXEC);
-#endif
-        XLATE_BIT (flags, gf_flags, O_LARGEFILE);
-
-        return gf_flags;
-}
-
-static inline uint32_t
-gf_flags_to_flags (uint32_t gf_flags)
-{
-        uint32_t flags = 0;
-
-        UNXLATE_ACCESSMODE (gf_flags, flags);
-
-        UNXLATE_BIT (gf_flags, flags, O_CREAT);
-        UNXLATE_BIT (gf_flags, flags, O_EXCL);
-        UNXLATE_BIT (gf_flags, flags, O_NOCTTY);
-        UNXLATE_BIT (gf_flags, flags, O_TRUNC);
-        UNXLATE_BIT (gf_flags, flags, O_APPEND);
-        UNXLATE_BIT (gf_flags, flags, O_NONBLOCK);
-        UNXLATE_BIT (gf_flags, flags, O_SYNC);
-        UNXLATE_BIT (gf_flags, flags, O_ASYNC);
-
-        UNXLATE_BIT (gf_flags, flags, O_DIRECT);
-        UNXLATE_BIT (gf_flags, flags, O_DIRECTORY);
-        UNXLATE_BIT (gf_flags, flags, O_NOFOLLOW);
-#ifdef O_NOATIME
-        UNXLATE_BIT (gf_flags, flags, O_NOATIME);
-#endif
-#ifdef O_CLOEXEC
-        UNXLATE_BIT (gf_flags, flags, O_CLOEXEC);
-#endif
-        UNXLATE_BIT (gf_flags, flags, O_LARGEFILE);
-
-        return flags;
-}
-
-
 struct gf_statfs {
 	u_quad_t bsize;
 	u_quad_t frsize;
@@ -166,45 +51,6 @@ struct gf_statfs {
 };
 typedef struct gf_statfs gf_statfs;
 
-static inline void
-gf_statfs_to_statfs (struct gf_statfs *gf_stat, struct statvfs *stat)
-{
-        if (!stat || !gf_stat)
-                return;
-
-	stat->f_bsize   =  (gf_stat->bsize);
-	stat->f_frsize  =  (gf_stat->frsize);
-	stat->f_blocks  =  (gf_stat->blocks);
-	stat->f_bfree   =  (gf_stat->bfree);
-	stat->f_bavail  =  (gf_stat->bavail);
-	stat->f_files   =  (gf_stat->files);
-	stat->f_ffree   =  (gf_stat->ffree);
-	stat->f_favail  =  (gf_stat->favail);
-	stat->f_fsid    =  (gf_stat->fsid);
-	stat->f_flag    =  (gf_stat->flag);
-	stat->f_namemax =  (gf_stat->namemax);
-}
-
-
-static inline void
-gf_statfs_from_statfs (struct gf_statfs *gf_stat, struct statvfs *stat)
-{
-        if (!stat || !gf_stat)
-                return;
-
-	gf_stat->bsize   = stat->f_bsize;
-	gf_stat->frsize  = stat->f_frsize;
-	gf_stat->blocks  = stat->f_blocks;
-	gf_stat->bfree   = stat->f_bfree;
-	gf_stat->bavail  = stat->f_bavail;
-	gf_stat->files   = stat->f_files;
-	gf_stat->ffree   = stat->f_ffree;
-	gf_stat->favail  = stat->f_favail;
-	gf_stat->fsid    = stat->f_fsid;
-	gf_stat->flag    = stat->f_flag;
-	gf_stat->namemax = stat->f_namemax;
-}
-
 struct gf_proto_flock {
 	u_int type;
 	u_int whence;
@@ -215,36 +61,6 @@ struct gf_proto_flock {
 };
 typedef struct gf_proto_flock gf_proto_flock;
 
-
-static inline void
-gf_proto_flock_to_flock (struct gf_proto_flock *gf_proto_flock, struct gf_flock *gf_flock)
-{
-        if (!gf_flock || !gf_proto_flock)
-                return;
-
-	gf_flock->l_type     = gf_proto_flock->type;
-	gf_flock->l_whence   = gf_proto_flock->whence;
-	gf_flock->l_start    = gf_proto_flock->start;
-	gf_flock->l_len      = gf_proto_flock->len;
-	gf_flock->l_pid      = gf_proto_flock->pid;
-	gf_flock->l_owner    = gf_proto_flock->owner;
-}
-
-
-static inline void
-gf_proto_flock_from_flock (struct gf_proto_flock *gf_proto_flock, struct gf_flock *gf_flock)
-{
-        if (!gf_flock || !gf_proto_flock)
-                return;
-
-	gf_proto_flock->type     =  (gf_flock->l_type);
-	gf_proto_flock->whence   =  (gf_flock->l_whence);
-	gf_proto_flock->start    =  (gf_flock->l_start);
-	gf_proto_flock->len      =  (gf_flock->l_len);
-	gf_proto_flock->pid      =  (gf_flock->l_pid)
-;	gf_proto_flock->owner    =  (gf_flock->l_owner);
-}
-
 struct gf_iatt {
 	char ia_gfid[16];
 	u_quad_t ia_ino;
@@ -266,60 +82,6 @@ struct gf_iatt {
 };
 typedef struct gf_iatt gf_iatt;
 
-
-static inline void
-gf_stat_to_iatt (struct gf_iatt *gf_stat, struct iatt *iatt)
-{
-        if (!iatt || !gf_stat)
-                return;
-
-        memcpy (iatt->ia_gfid, gf_stat->ia_gfid, 16);
-	iatt->ia_ino = gf_stat->ia_ino ;
-	iatt->ia_dev = gf_stat->ia_dev ;
-	iatt->ia_type = ia_type_from_st_mode (gf_stat->mode) ;
-	iatt->ia_prot = ia_prot_from_st_mode (gf_stat->mode) ;
-	iatt->ia_nlink = gf_stat->ia_nlink ;
-	iatt->ia_uid = gf_stat->ia_uid ;
-	iatt->ia_gid = gf_stat->ia_gid ;
-	iatt->ia_rdev = gf_stat->ia_rdev ;
-	iatt->ia_size = gf_stat->ia_size ;
-	iatt->ia_blksize = gf_stat->ia_blksize ;
-	iatt->ia_blocks = gf_stat->ia_blocks ;
-	iatt->ia_atime = gf_stat->ia_atime ;
-	iatt->ia_atime_nsec = gf_stat->ia_atime_nsec ;
-	iatt->ia_mtime = gf_stat->ia_mtime ;
-	iatt->ia_mtime_nsec = gf_stat->ia_mtime_nsec ;
-	iatt->ia_ctime = gf_stat->ia_ctime ;
-	iatt->ia_ctime_nsec = gf_stat->ia_ctime_nsec ;
-}
-
-
-static inline void
-gf_stat_from_iatt (struct gf_iatt *gf_stat, struct iatt *iatt)
-{
-        if (!iatt || !gf_stat)
-                return;
-
-        memcpy (gf_stat->ia_gfid, iatt->ia_gfid, 16);
-	gf_stat->ia_ino = iatt->ia_ino ;
-	gf_stat->ia_dev = iatt->ia_dev ;
-	gf_stat->mode   = st_mode_from_ia (iatt->ia_prot, iatt->ia_type);
-	gf_stat->ia_nlink = iatt->ia_nlink ;
-	gf_stat->ia_uid = iatt->ia_uid ;
-	gf_stat->ia_gid = iatt->ia_gid ;
-	gf_stat->ia_rdev = iatt->ia_rdev ;
-	gf_stat->ia_size = iatt->ia_size ;
-	gf_stat->ia_blksize = iatt->ia_blksize ;
-	gf_stat->ia_blocks = iatt->ia_blocks ;
-	gf_stat->ia_atime = iatt->ia_atime ;
-	gf_stat->ia_atime_nsec = iatt->ia_atime_nsec ;
-	gf_stat->ia_mtime = iatt->ia_mtime ;
-	gf_stat->ia_mtime_nsec = iatt->ia_mtime_nsec ;
-	gf_stat->ia_ctime = iatt->ia_ctime ;
-	gf_stat->ia_ctime_nsec = iatt->ia_ctime_nsec ;
-}
-
-
 /* Gluster FS Payload structures */
 struct gfs3_stat_req {
 	char gfid[16];
@@ -409,7 +171,7 @@ typedef struct gfs3_unlink_rsp gfs3_unlink_rsp;
 
 struct gfs3_rmdir_req {
 	char pargfid[16];
-        int  flags;
+	int flags;
 	char *path;
 	char *bname;
 };