andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

features/marker: whitespace cleanup

Browse Source 
Signed-off-by: Raghavendra G <raghavendra@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>

BUG: 2697 (Quota: add-brick creates the size go awkward, though it was perfect earlier)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2697
This commit is contained in:
Raghavendra G 2011-05-08 23:41:23 +00:00 committed by Anand Avati
parent 86c818a98a
commit e08383ca12
4 changed files with 203 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xlators/features/marker/src/marker-common.c
View File

@ -42,7 +42,7 @@ int32_t
marker_force_inode_ctx_get (inode_t *inode, xlator_t *this,
marker_inode_ctx_t **ctx)
{
int32_t ret = -1;
int32_t ret = -1;
uint64_t ctx_int = 0;
LOCK (&inode->lock);
@ -71,16 +71,16 @@ unlock: UNLOCK (&inode->lock);
void
marker_filter_quota_xattr (dict_t *dict, char *key,
data_t *value, void *data)
data_t *value, void *data)
{
int ret = -1;
int ret = -1;
GF_VALIDATE_OR_GOTO ("marker", dict, out);
GF_VALIDATE_OR_GOTO ("marker", key, out);
GF_VALIDATE_OR_GOTO ("marker", dict, out);
GF_VALIDATE_OR_GOTO ("marker", key, out);
ret = fnmatch ("trusted.glusterfs.quota*", key, 0);
if (ret == 0)
dict_del (dict, key);
ret = fnmatch ("trusted.glusterfs.quota*", key, 0);
if (ret == 0)
dict_del (dict, key);
out:
return;
return;
}

177
xlators/features/marker/src/marker-quota.c
View File

@ -34,7 +34,7 @@ void
mq_assign_lk_owner (xlator_t *this, call_frame_t *frame)
{
marker_conf_t *conf = NULL;
uint64_t lk_owner = 0;
uint64_t lk_owner = 0;
conf = this->private;
@ -125,7 +125,7 @@ int32_t
release_lock_on_dirty_inode (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno)
{
struct gf_flock lock;
struct gf_flock lock = {0, };
quota_local_t *local = NULL;
local = frame->local;
@ -158,13 +158,13 @@ release_lock_on_dirty_inode (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t
mark_inode_undirty (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, dict_t *dict)
int32_t op_ret, int32_t op_errno, dict_t *dict)
{
int32_t ret = -1;
int64_t *size = NULL;
dict_t *newdict = NULL;
quota_local_t *local = NULL;
marker_conf_t *priv = NULL;
int32_t ret = -1;
int64_t *size = NULL;
dict_t *newdict = NULL;
quota_local_t *local = NULL;
marker_conf_t *priv = NULL;
local = (quota_local_t *) frame->local;
@ -282,10 +282,10 @@ err:
int32_t
get_dirty_inode_size (call_frame_t *frame, xlator_t *this)
{
int32_t ret = -1;
dict_t *dict = NULL;
quota_local_t *local = NULL;
marker_conf_t *priv = NULL;
int32_t ret = -1;
dict_t *dict = NULL;
quota_local_t *local = NULL;
marker_conf_t *priv = NULL;
local = (quota_local_t *) frame->local;
@ -326,11 +326,11 @@ get_child_contribution (call_frame_t *frame,
dict_t *dict,
struct iatt *postparent)
{
int32_t ret = -1;
int32_t val = 0;
char contri_key [512] = {0, };
int64_t *contri = NULL;
quota_local_t *local = NULL;
int32_t ret = -1;
int32_t val = 0;
char contri_key [512] = {0, };
int64_t *contri = NULL;
quota_local_t *local = NULL;
local = frame->local;
@ -389,15 +389,15 @@ quota_readdir_cbk (call_frame_t *frame,
int32_t op_errno,
gf_dirent_t *entries)
{
char contri_key [512] = {0, };
loc_t loc;
int32_t ret = 0;
off_t offset = 0;
int32_t count = 0;
dict_t *dict = NULL;
quota_local_t *local = NULL;
gf_dirent_t *entry = NULL;
call_frame_t *newframe = NULL;
char contri_key [512] = {0, };
int32_t ret = 0;
off_t offset = 0;
int32_t count = 0;
dict_t *dict = NULL;
quota_local_t *local = NULL;
gf_dirent_t *entry = NULL;
call_frame_t *newframe = NULL;
loc_t loc = {0, };
local = frame->local;
@ -418,15 +418,15 @@ quota_readdir_cbk (call_frame_t *frame,
local->dentry_child_count = 0;
list_for_each_entry (entry, (&entries->list), list) {
gf_log (this->name, GF_LOG_DEBUG, "entry = %s", entry->d_name);
gf_log (this->name, GF_LOG_DEBUG, "entry = %s", entry->d_name);
if ((!strcmp (entry->d_name, ".")) || (!strcmp (entry->d_name,
".."))) {
gf_log (this->name, GF_LOG_DEBUG, "entry = %s",
entry->d_name);
continue;
}
count++;
if ((!strcmp (entry->d_name, ".")) || (!strcmp (entry->d_name,
".."))) {
gf_log (this->name, GF_LOG_DEBUG, "entry = %s",
entry->d_name);
continue;
}
count++;
}
local->frame = frame;
@ -586,8 +586,8 @@ check_if_still_dirty (call_frame_t *frame,
priv = this->private;
if (!dict) {
ret = -1;
goto err;
ret = -1;
goto err;
}
ret = dict_get_int8 (dict, QUOTA_DIRTY_KEY, &dirty);
@ -626,10 +626,10 @@ int32_t
get_dirty_xattr (call_frame_t *frame, void *cookie,
xlator_t *this, int32_t op_ret, int32_t op_errno)
{
int32_t ret = -1;
dict_t *xattr_req = NULL;
quota_local_t *local = NULL;
marker_conf_t *priv = NULL;
int32_t ret = -1;
dict_t *xattr_req = NULL;
quota_local_t *local = NULL;
marker_conf_t *priv = NULL;
if (op_ret == -1) {
dirty_inode_updation_done (frame, NULL, this, 0, 0);
@ -716,7 +716,7 @@ update_dirty_inode (xlator_t *this,
return 0;
fr_destroy:
QUOTA_STACK_DESTROY (frame, this);
QUOTA_STACK_DESTROY (frame, this);
out:
return 0;
@ -968,9 +968,9 @@ quota_release_parent_lock (call_frame_t *frame, void *cookie,
int32_t op_errno)
{
int32_t ret = 0;
struct gf_flock lock;
quota_local_t *local = NULL;
quota_inode_ctx_t *ctx = NULL;
struct gf_flock lock = {0, };
local = frame->local;
@ -1029,7 +1029,7 @@ quota_mark_undirty (call_frame_t *frame,
priv = this->private;
//update the size of the parent inode
//update the size of the parent inode
if (dict != NULL) {
ret = quota_inode_ctx_get (local->parent_loc.inode, this, &ctx);
if (ret < 0)
@ -1160,16 +1160,16 @@ quota_update_inode_contribution (call_frame_t *frame, void *cookie,
struct iatt *buf, dict_t *dict,
struct iatt *postparent)
{
int32_t ret = -1;
int64_t *size = NULL;
int64_t *contri = NULL;
int64_t *delta = NULL;
int32_t ret = -1;
int64_t *size = NULL;
int64_t *contri = NULL;
int64_t *delta = NULL;
char contri_key [512] = {0, };
dict_t *newdict = NULL;
quota_local_t *local = NULL;
quota_inode_ctx_t *ctx = NULL;
marker_conf_t *priv = NULL;
inode_contribution_t *contribution = NULL;
dict_t *newdict = NULL;
quota_local_t *local = NULL;
quota_inode_ctx_t *ctx = NULL;
marker_conf_t *priv = NULL;
inode_contribution_t *contribution = NULL;
local = frame->local;
@ -1264,12 +1264,12 @@ quota_fetch_child_size_and_contri (call_frame_t *frame, void *cookie,
xlator_t *this, int32_t op_ret,
int32_t op_errno)
{
int32_t ret = -1;
int32_t ret = -1;
char contri_key [512] = {0, };
dict_t *newdict = NULL;
quota_local_t *local = NULL;
marker_conf_t *priv = NULL;
quota_inode_ctx_t *ctx = NULL;
dict_t *newdict = NULL;
quota_local_t *local = NULL;
marker_conf_t *priv = NULL;
quota_inode_ctx_t *ctx = NULL;
local = frame->local;
@ -1390,7 +1390,7 @@ err:
int32_t
get_lock_on_parent (call_frame_t *frame, xlator_t *this)
{
struct gf_flock lock;
struct gf_flock lock = {0, };
quota_local_t *local = NULL;
GF_VALIDATE_OR_GOTO ("marker", frame, fr_destroy);
@ -1467,8 +1467,8 @@ err:
int
initiate_quota_txn (xlator_t *this, loc_t *loc)
{
int32_t ret = -1;
quota_inode_ctx_t *ctx = NULL;
int32_t ret = -1;
quota_inode_ctx_t *ctx = NULL;
inode_contribution_t *contribution = NULL;
VALIDATE_OR_GOTO (loc, out);
@ -1506,19 +1506,19 @@ validate_inode_size_contribution (xlator_t *this,
int32_t
inspect_directory_xattr (xlator_t *this,
loc_t *loc,
dict_t *dict,
struct iatt buf)
loc_t *loc,
dict_t *dict,
struct iatt buf)
{
int32_t ret = 0;
int8_t dirty = -1;
int64_t *size = NULL;
int64_t *contri = NULL;
char contri_key [512] = {0, };
marker_conf_t *priv = NULL;
gf_boolean_t not_root = _gf_false;
quota_inode_ctx_t *ctx = NULL;
inode_contribution_t *contribution = NULL;
int32_t ret = 0;
int8_t dirty = -1;
int64_t *size = NULL;
int64_t *contri = NULL;
char contri_key [512] = {0, };
marker_conf_t *priv = NULL;
gf_boolean_t not_root = _gf_false;
quota_inode_ctx_t *ctx = NULL;
inode_contribution_t *contribution = NULL;
priv = this->private;
@ -1590,13 +1590,13 @@ inspect_file_xattr (xlator_t *this,
dict_t *dict,
struct iatt buf)
{
int32_t ret = -1;
uint64_t contri_int = 0;
int64_t *contri_ptr = NULL;
int32_t ret = -1;
uint64_t contri_int = 0;
int64_t *contri_ptr = NULL;
char contri_key [512] = {0, };
marker_conf_t *priv = NULL;
quota_inode_ctx_t *ctx = NULL;
inode_contribution_t *contribution = NULL;
marker_conf_t *priv = NULL;
quota_inode_ctx_t *ctx = NULL;
inode_contribution_t *contribution = NULL;
priv = this->private;
@ -1621,7 +1621,8 @@ inspect_file_xattr (xlator_t *this,
}
UNLOCK (&ctx->lock);
list_for_each_entry (contribution, &ctx->contribution_head, contri_list) {
list_for_each_entry (contribution, &ctx->contribution_head,
contri_list) {
GET_CONTRI_KEY (contri_key, contribution->gfid, ret);
if (ret < 0)
continue;
@ -1717,9 +1718,9 @@ int32_t
quota_inode_remove_done (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno)
{
int32_t ret = 0;
char contri_key [512] = {0, };
quota_local_t *local = NULL;
int32_t ret = 0;
char contri_key [512] = {0, };
quota_local_t *local = NULL;
local = (quota_local_t *) frame->local;
@ -1732,8 +1733,8 @@ quota_inode_remove_done (call_frame_t *frame, void *cookie, xlator_t *this,
GET_CONTRI_KEY (contri_key, local->contri->gfid, ret);
STACK_WIND (frame, quota_removexattr_cbk, FIRST_CHILD(this),
FIRST_CHILD(this)->fops->removexattr,
&local->loc, contri_key);
FIRST_CHILD(this)->fops->removexattr,
&local->loc, contri_key);
ret = 0;
}
@ -1752,10 +1753,10 @@ int32_t
mq_inode_remove_done (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, dict_t *dict)
{
int32_t ret;
struct gf_flock lock;
quota_inode_ctx_t *ctx;
quota_local_t *local = NULL;
int32_t ret = -1;
struct gf_flock lock = {0, };
quota_inode_ctx_t *ctx = NULL;
quota_local_t *local = NULL;
local = frame->local;
if (op_ret == -1)

56
xlators/features/marker/src/marker-quota.h
View File

@ -53,7 +53,7 @@ char volname [40];
do { \
ret = 0; \
var = GF_CALLOC (sizeof (type), 1, \
gf_marker_mt_##type); \
gf_marker_mt_##type); \
if (!var) { \
gf_log ("", GF_LOG_ERROR, \
"out of memory"); \
@ -64,7 +64,7 @@ char volname [40];
#define QUOTA_ALLOC_OR_GOTO(var, type, ret, label) \
do { \
var = GF_CALLOC (sizeof (type), 1, \
gf_marker_mt_##type); \
gf_marker_mt_##type); \
if (!var) { \
gf_log ("", GF_LOG_ERROR, \
"out of memory"); \
@ -74,42 +74,42 @@ char volname [40];
ret = 0; \
} while (0);
#define GET_CONTRI_KEY(var, _gfid, _ret) \
do { \
char _gfid_unparsed[40]; \
uuid_unparse (_gfid, _gfid_unparsed); \
#define GET_CONTRI_KEY(var, _gfid, _ret) \
do { \
char _gfid_unparsed[40]; \
uuid_unparse (_gfid, _gfid_unparsed); \
_ret = snprintf (var, CONTRI_KEY_MAX, QUOTA_XATTR_PREFIX \
".%s.%s." CONTRIBUTION, VOL_NAME, \
_gfid_unparsed); \
".%s.%s." CONTRIBUTION, VOL_NAME, \
_gfid_unparsed); \
} while (0);
#define QUOTA_SAFE_INCREMENT(lock, var) \
do { \
LOCK (lock); \
var ++; \
UNLOCK (lock); \
#define QUOTA_SAFE_INCREMENT(lock, var) \
do { \
LOCK (lock); \
var ++; \
UNLOCK (lock); \
} while (0)
#define QUOTA_SAFE_DECREMENT(lock, var) \
do { \
LOCK (lock); \
var --; \
UNLOCK (lock); \
#define QUOTA_SAFE_DECREMENT(lock, var) \
do { \
LOCK (lock); \
var --; \
UNLOCK (lock); \
} while (0)
struct quota_inode_ctx {
int64_t size;
int8_t dirty;
gf_lock_t lock;
struct list_head contribution_head;
int64_t size;
int8_t dirty;
gf_lock_t lock;
struct list_head contribution_head;
};
typedef struct quota_inode_ctx quota_inode_ctx_t;
struct inode_contribution {
struct list_head contri_list;
int64_t contribution;
uuid_t gfid;
int64_t contribution;
uuid_t gfid;
};
typedef struct inode_contribution inode_contribution_t;
@ -122,12 +122,12 @@ struct quota_local {
int32_t hl_count;
int32_t dentry_child_count;
fd_t *fd;
fd_t *fd;
call_frame_t *frame;
gf_lock_t lock;
gf_lock_t lock;
loc_t loc;
loc_t parent_loc;
loc_t loc;
loc_t parent_loc;
quota_inode_ctx_t *ctx;
inode_contribution_t *contri;

150
xlators/features/marker/src/marker.c
View File

@ -187,13 +187,14 @@ out:
}
int32_t
stat_stampfile (xlator_t *this, marker_conf_t *priv, struct volume_mark **status)
stat_stampfile (xlator_t *this, marker_conf_t *priv,
struct volume_mark **status)
{
struct stat buf;
struct volume_mark *vol_mark;
struct stat buf = {0, };
struct volume_mark *vol_mark = NULL;
vol_mark = GF_CALLOC (sizeof (struct volume_mark), 1,
gf_marker_mt_volume_mark);
gf_marker_mt_volume_mark);
vol_mark->major = 1;
vol_mark->minor = 0;
@ -215,9 +216,9 @@ stat_stampfile (xlator_t *this, marker_conf_t *priv, struct volume_mark **status
int32_t
marker_getxattr_stampfile_cbk (call_frame_t *frame, xlator_t *this,
const char *name, struct volume_mark *vol_mark)
const char *name, struct volume_mark *vol_mark)
{
int32_t ret;
int32_t ret = -1;
dict_t *dict = NULL;
if (vol_mark == NULL){
@ -229,7 +230,7 @@ marker_getxattr_stampfile_cbk (call_frame_t *frame, xlator_t *this,
dict = dict_new ();
ret = dict_set_bin (dict, (char *)name, vol_mark,
sizeof (struct volume_mark));
sizeof (struct volume_mark));
STACK_UNWIND_STRICT (getxattr, frame, 0, 0, dict);
@ -262,14 +263,14 @@ out:
int32_t
marker_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, dict_t *dict)
int32_t op_ret, int32_t op_errno, dict_t *dict)
{
if (cookie) {
gf_log (this->name, GF_LOG_DEBUG,
"Filtering the quota extended attributes");
if (cookie) {
gf_log (this->name, GF_LOG_DEBUG,
"Filtering the quota extended attributes");
dict_foreach (dict, marker_filter_quota_xattr, NULL);
}
dict_foreach (dict, marker_filter_quota_xattr, NULL);
}
STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, dict);
return 0;
}
@ -292,19 +293,19 @@ marker_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
ret = call_from_special_client (frame, this, name);
wind:
if (ret == _gf_false) {
if (name == NULL) {
if (name == NULL) {
/* Signifies that marker translator
* has to filter the quota's xattr's,
* this is to prevent afr from performing
* self healing on marker-quota xattrs'
*/
cookie = 1;
cookie = 1;
}
STACK_WIND_COOKIE (frame, marker_getxattr_cbk, (void *)cookie,
FIRST_CHILD(this),
FIRST_CHILD(this)->fops->getxattr, loc,
name);
}
}
return 0;
}
@ -398,7 +399,7 @@ marker_start_setxattr (call_frame_t *frame, xlator_t *this)
void
marker_gettimeofday (marker_local_t *local)
{
struct timeval tv;
struct timeval tv = {0, };
gettimeofday (&tv, NULL);
@ -437,9 +438,9 @@ marker_xtime_update_marks (xlator_t *this, marker_local_t *local)
int32_t
marker_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
int32_t op_ret, int32_t op_errno, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
{
marker_conf_t *priv = NULL;
marker_local_t *local = NULL;
@ -508,9 +509,9 @@ err:
int32_t
marker_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, fd_t *fd, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
int32_t op_ret, int32_t op_errno, fd_t *fd, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -546,7 +547,7 @@ out:
int32_t
marker_create (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
mode_t mode, fd_t *fd, dict_t *params)
mode_t mode, fd_t *fd, dict_t *params)
{
int32_t ret = 0;
marker_local_t *local = NULL;
@ -571,7 +572,8 @@ wind:
params);
return 0;
err:
STACK_UNWIND_STRICT (create, frame, -1, ENOMEM, NULL, NULL, NULL, NULL, NULL);
STACK_UNWIND_STRICT (create, frame, -1, ENOMEM, NULL, NULL, NULL, NULL,
NULL);
return 0;
}
@ -615,12 +617,12 @@ out:
int32_t
marker_writev (call_frame_t *frame,
xlator_t *this,
fd_t *fd,
struct iovec *vector,
int32_t count,
off_t offset,
struct iobref *iobref)
xlator_t *this,
fd_t *fd,
struct iovec *vector,
int32_t count,
off_t offset,
struct iobref *iobref)
{
int32_t ret = 0;
marker_local_t *local = NULL;
@ -653,8 +655,8 @@ err:
int32_t
marker_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, struct iatt *preparent,
struct iatt *postparent)
int32_t op_ret, int32_t op_errno, struct iatt *preparent,
struct iatt *postparent)
{
marker_conf_t *priv = NULL;
marker_local_t *local = NULL;
@ -720,8 +722,8 @@ err:
int32_t
marker_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, struct iatt *preparent,
struct iatt *postparent)
int32_t op_ret, int32_t op_errno, struct iatt *preparent,
struct iatt *postparent)
{
marker_conf_t *priv = NULL;
marker_local_t *local = NULL;
@ -820,9 +822,9 @@ err:
int32_t
marker_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
int32_t op_ret, int32_t op_errno, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -888,13 +890,13 @@ err:
int32_t
marker_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, struct iatt *buf,
struct iatt *preoldparent, struct iatt *postoldparent,
struct iatt *prenewparent, struct iatt *postnewparent)
int32_t op_ret, int32_t op_errno, struct iatt *buf,
struct iatt *preoldparent, struct iatt *postoldparent,
struct iatt *prenewparent, struct iatt *postnewparent)
{
marker_conf_t *priv = NULL;
marker_local_t *local = NULL;
marker_local_t *oplocal = NULL;
marker_local_t *oplocal = NULL;
loc_t newloc = {0, };
if (op_ret == -1) {
@ -1031,7 +1033,7 @@ rename_wind:
return 0;
err:
STACK_UNWIND_STRICT (rename, frame, -1, ENOMEM, NULL,
NULL, NULL, NULL, NULL);
NULL, NULL, NULL, NULL);
return 0;
}
@ -1039,8 +1041,8 @@ err:
int32_t
marker_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
struct iatt *postbuf)
int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
struct iatt *postbuf)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -1107,8 +1109,8 @@ err:
int32_t
marker_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
struct iatt *postbuf)
int32_t op_ret, int32_t op_errno, struct iatt *prebuf,
struct iatt *postbuf)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -1174,9 +1176,9 @@ err:
int32_t
marker_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
int32_t op_ret, int32_t op_errno, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
{
marker_conf_t *priv = NULL;
marker_local_t *local = NULL;
@ -1211,7 +1213,7 @@ out:
int
marker_symlink (call_frame_t *frame, xlator_t *this, const char *linkpath,
loc_t *loc, dict_t *params)
loc_t *loc, dict_t *params)
{
int32_t ret = 0;
marker_local_t *local = NULL;
@ -1236,16 +1238,16 @@ wind:
return 0;
err:
STACK_UNWIND_STRICT (symlink, frame, -1, ENOMEM, NULL,
NULL, NULL, NULL);
NULL, NULL, NULL);
return 0;
}
int32_t
marker_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
int32_t op_ret, int32_t op_errno, inode_t *inode,
struct iatt *buf, struct iatt *preparent,
struct iatt *postparent)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -1281,7 +1283,7 @@ out:
int
marker_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
dev_t rdev, dict_t *parms)
dev_t rdev, dict_t *parms)
{
int32_t ret = 0;
marker_local_t *local = NULL;
@ -1347,7 +1349,7 @@ call_from_sp_client_to_reset_tmfile (call_frame_t *frame,
}
if (data->len == 0 || (data->len == 5 &&
memcmp (data->data, "RESET", 5) == 0)) {
memcmp (data->data, "RESET", 5) == 0)) {
fd = open (priv->timestamp_file, O_WRONLY|O_TRUNC);
if (fd != -1) {
/* TODO check whether the O_TRUNC would update the
@ -1376,7 +1378,7 @@ out:
int32_t
marker_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno)
int32_t op_ret, int32_t op_errno)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -1407,7 +1409,7 @@ out:
int32_t
marker_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict,
int32_t flags)
int32_t flags)
{
int32_t ret = 0;
marker_local_t *local = NULL;
@ -1443,7 +1445,7 @@ err:
int32_t
marker_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno)
int32_t op_ret, int32_t op_errno)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -1474,7 +1476,7 @@ out:
int32_t
marker_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *dict,
int32_t flags)
int32_t flags)
{
int32_t ret = 0;
marker_local_t *local = NULL;
@ -1510,8 +1512,8 @@ err:
int32_t
marker_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, struct iatt *statpre,
struct iatt *statpost)
int32_t op_ret, int32_t op_errno, struct iatt *statpre,
struct iatt *statpost)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -1544,7 +1546,7 @@ out:
int32_t
marker_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
struct iatt *stbuf, int32_t valid)
struct iatt *stbuf, int32_t valid)
{
int32_t ret = 0;
marker_local_t *local = NULL;
@ -1576,8 +1578,8 @@ err:
int32_t
marker_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno, struct iatt *statpre,
struct iatt *statpost)
int32_t op_ret, int32_t op_errno, struct iatt *statpre,
struct iatt *statpost)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -1612,7 +1614,7 @@ out:
int32_t
marker_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
struct iatt *stbuf, int32_t valid)
struct iatt *stbuf, int32_t valid)
{
int32_t ret = 0;
marker_local_t *local = NULL;
@ -1644,7 +1646,7 @@ err:
int32_t
marker_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
int32_t op_ret, int32_t op_errno)
int32_t op_ret, int32_t op_errno)
{
marker_local_t *local = NULL;
marker_conf_t *priv = NULL;
@ -1675,7 +1677,7 @@ out:
int32_t
marker_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
const char *name)
const char *name)
{
int32_t ret = 0;
marker_local_t *local = NULL;
@ -1785,7 +1787,7 @@ mem_acct_init (xlator_t *this)
if (ret != 0) {
gf_log(this->name, GF_LOG_ERROR, "Memory accounting init"
"failed");
"failed");
return ret;
}
@ -1811,12 +1813,14 @@ init_xtime_priv (xlator_t *this, dict_t *options)
ret = uuid_parse (priv->volume_uuid, priv->volume_uuid_bin);
if (ret == -1) {
gf_log (this->name, GF_LOG_ERROR, "invalid volume uuid %s", priv->volume_uuid);
gf_log (this->name, GF_LOG_ERROR,
"invalid volume uuid %s", priv->volume_uuid);
goto out;
}
ret = gf_asprintf (& (priv->marker_xattr), "%s.%s.%s",
MARKER_XATTR_PREFIX, priv->volume_uuid, XTIME);
MARKER_XATTR_PREFIX, priv->volume_uuid,
XTIME);
if (ret == -1){
priv->marker_xattr = NULL;
@ -2066,7 +2070,7 @@ struct xlator_fops fops = {
};
struct xlator_cbks cbks = {
.forget = marker_forget
.forget = marker_forget
};
struct volume_options options[] = {