glusterfs.git -

diff options

author	Kaleb S. KEITHLEY <kkeithle@redhat.com>	2015-09-14 12:32:09 -0400
committer	Kaleb KEITHLEY <kkeithle@redhat.com>	2015-09-24 16:36:01 -0700
commit	045cb34238e341d68288893b8f040056e138c04e (patch)
tree	10f790ea0b896c4cfcf51f5caa222eb886a78767 /cli/src
parent	69e4d76e69537f8d42b4a11f8785ddaabb58b1dc (diff)

common-ha: refresh-config output includes dbus "method return" msg

filter out extraneous text from dbus-send Change-Id: If8467f8e756584027d36559960fd691dcaf98993 BUG: 1262881 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/12174 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com> Reviewed-by: soumya k <skoduri@redhat.com>

Diffstat (limited to 'cli/src')

0 files changed, 0 insertions, 0 deletions

luster, Inc. <http://www.gluster.com>

- This file is part of GlusterFS.

- GlusterFS is free software; you can redistribute it and/or modify

- it under the terms of the GNU General Public License as published

- by the Free Software Foundation; either version 3 of the License,

- or (at your option) any later version.

- GlusterFS is distributed in the hope that it will be useful, but

- WITHOUT ANY WARRANTY; without even the implied warranty of

- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

- General Public License for more details.

- You should have received a copy of the GNU General Public License

- along with this program. If not, see

- <http://www.gnu.org/licenses/>.

-*/

+ This file is part of GlusterFS.

+ This file is licensed to you under your choice of the GNU Lesser

+ General Public License, version 3 or any later version (LGPLv3 or

+ later), or the GNU General Public License, version 2 (GPLv2), in all

+ cases as published by the Free Software Foundation.

+*/

#include <ctype.h>

#include <sys/uio.h>

@@ -32,13 +22,13 @@

#include "rot-13.h"

- * This is a rot13 ``encryption'' xlator. It rot13's data when

- * writing to disk and rot13's it back when reading it.

+ * This is a rot13 ``encryption'' xlator. It rot13's data when

+ * writing to disk and rot13's it back when reading it.

* This xlator is meant as an example, NOT FOR PRODUCTION

* USE ;) (hence no error-checking)

-void

+void

rot13 (char *buf, int len)

{

int i;

@@ -68,14 +58,15 @@ rot13_readv_cbk (call_frame_t *frame,

struct iovec *vector,

int32_t count,

struct iatt *stbuf,

- struct iobref *iobref)

+ struct iobref *iobref, dict_t *xdata)

{

rot_13_private_t *priv = (rot_13_private_t *)this->private;

if (priv->decrypt_read)

rot13_iovec (vector, count);

- STACK_UNWIND (frame, op_ret, op_errno, vector, count, stbuf, iobref);

+ STACK_UNWIND_STRICT (readv, frame, op_ret, op_errno, vector, count,

+ stbuf, iobref, xdata);

return 0;

}

@@ -84,13 +75,13 @@ rot13_readv (call_frame_t *frame,

xlator_t *this,

fd_t *fd,

size_t size,

- off_t offset)

+ off_t offset, uint32_t flags, dict_t *xdata)

{

STACK_WIND (frame,

rot13_readv_cbk,

FIRST_CHILD (this),

FIRST_CHILD (this)->fops->readv,

- fd, size, offset);

+ fd, size, offset, flags, xdata);

return 0;

}

@@ -101,9 +92,10 @@ rot13_writev_cbk (call_frame_t *frame,

int32_t op_ret,

int32_t op_errno,

struct iatt *prebuf,

- struct iatt *postbuf)

+ struct iatt *postbuf, dict_t *xdata)

{

- STACK_UNWIND (frame, op_ret, op_errno, prebuf, postbuf);

+ STACK_UNWIND_STRICT (writev, frame, op_ret, op_errno, prebuf, postbuf,

+ xdata);

return 0;

}

@@ -112,20 +104,20 @@ rot13_writev (call_frame_t *frame,

xlator_t *this,

fd_t *fd,

struct iovec *vector,

- int32_t count,

- off_t offset,

- struct iobref *iobref)

+ int32_t count,

+ off_t offset, uint32_t flags,

+ struct iobref *iobref, dict_t *xdata)

{

rot_13_private_t *priv = (rot_13_private_t *)this->private;

if (priv->encrypt_write)

rot13_iovec (vector, count);

- STACK_WIND (frame,

+ STACK_WIND (frame,

rot13_writev_cbk,

FIRST_CHILD (this),

FIRST_CHILD (this)->fops->writev,

- fd, vector, count, offset,

- iobref);

+ fd, vector, count, offset, flags,

+ iobref, xdata);

return 0;

}

@@ -136,7 +128,7 @@ init (xlator_t *this)

rot_13_private_t *priv = NULL;

if (!this->children || this->children->next) {

- gf_log ("rot13", GF_LOG_ERROR,

+ gf_log ("rot13", GF_LOG_ERROR,

"FATAL: rot13 should have exactly one child");

return -1;

}

@@ -145,9 +137,11 @@ init (xlator_t *this)

gf_log (this->name, GF_LOG_WARNING,

"dangling volume. check volfile ");

}

- priv = CALLOC (sizeof (rot_13_private_t), 1);

- ERR_ABORT (priv);

+ priv = GF_CALLOC (sizeof (rot_13_private_t), 1, 0);

+ if (!priv)

+ return -1;

priv->decrypt_read = 1;

priv->encrypt_write = 1;

@@ -156,6 +150,7 @@ init (xlator_t *this)

if (gf_string2boolean (data->data, &priv->encrypt_write) == -1) {

gf_log (this->name, GF_LOG_ERROR,

"encrypt-write takes only boolean options");

+ GF_FREE (priv);

return -1;

}

@@ -165,6 +160,7 @@ init (xlator_t *this)

if (gf_string2boolean (data->data, &priv->decrypt_r


context:
space:
mode: