diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-02-11 14:02:43 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-02-11 14:02:43 +0000 |
| commit | 0d92798e88c5444fb2cc23663b4ea9a345887756 (patch) | |
| tree | a71f336115753242e8690547f403405a3373ddf1 /libglusterfs/src/glusterfs.h | |
| parent | 33939dcde38389373e7ed8b12c6e9916b39411d0 (diff) | |
| parent | 408d50a64b7b3a9d6a4899060baa423ff126cc5f (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
xlators/mgmt/glusterd/src/Makefile.am
Change-Id: Ida5ec4aecc358cb2268bdfdb1a8c9bab750f9575
Diffstat (limited to 'libglusterfs/src/glusterfs.h')
| -rw-r--r-- | libglusterfs/src/glusterfs.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index 517e4270a..f537110d7 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -364,9 +364,10 @@ struct _cmd_args { int aux_gfid_mount; struct list_head xlator_options; /* list of xlator_option_t */ - /* fuse options */ - int fuse_direct_io_mode; - char *use_readdirp; + /* fuse options */ + int fuse_direct_io_mode; + char *use_readdirp; + int no_root_squash; int volfile_check; double fuse_entry_timeout; double fuse_negative_timeout; |