diff options
| author | Niels de Vos <ndevos@redhat.com> | 2016-04-18 21:47:18 +0200 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-04-28 13:51:12 -0700 |
| commit | 2f945b86d30eca3a32f5e8e42fbe692ddf4b55be (patch) | |
| tree | 61765dd2febe2fa5416fdf6e37625e4d66d3f094 /libglusterfs/src/lkowner.h | |
| parent | 40e96c17647b281264783520f8fbdd9056332b4c (diff) | |
rpc: split FOPs enum from glusterfs.h
Moving the enumeration of FOPs and some of the other parts that are
defining the network protocol to the rpc/xdr/ section. These structures
need some care when modifications are made, moving them out of the
common glusterfs.h header helps with that.
The protocol definition structures are generated in a new glusterfs-fops
header. This file is present in rpc/xdr/src/ and libglusterfs/src/, it
is a little ugly, but prevents the need to update all Makefile.am files
with the additional -I option for finding the new header file.
The generation of the .c and .h files from the .x descriptions needed
small modifications to accommodate these changes. The build/xdrgen
script was improved slightly for this. The .c and .h files are
incorrectly in the $(top_srcdir), instead of $(top_builddir). This is
an existing issue, and bug 1330604 has been filed to get that addressed.
Change-Id: I98fc8cf7e4b631082c7b203b5a0a77111bec1fb9
BUG: 1328502
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/14032
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'libglusterfs/src/lkowner.h')
| -rw-r--r-- | libglusterfs/src/lkowner.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libglusterfs/src/lkowner.h b/libglusterfs/src/lkowner.h index c3e16760869..b6a950f5e12 100644 --- a/libglusterfs/src/lkowner.h +++ b/libglusterfs/src/lkowner.h @@ -11,17 +11,7 @@ #ifndef _LK_OWNER_H #define _LK_OWNER_H -#define GF_MAX_LOCK_OWNER_LEN 1024 /* 1kB as per NLM */ - -/* 16strings-16strings-... */ -#define GF_LKOWNER_BUF_SIZE ((GF_MAX_LOCK_OWNER_LEN * 2) + \ - (GF_MAX_LOCK_OWNER_LEN / 8)) - -typedef struct gf_lkowner_ { - int len; - char data[GF_MAX_LOCK_OWNER_LEN]; -} gf_lkowner_t; - +#include "glusterfs-fops.h" /* LKOWNER to string functions */ static inline void |