diff options
| author | Gluster Ant <bugzilla-bot@gluster.org> | 2018-09-12 17:52:45 +0530 |
|---|---|---|
| committer | Nigel Babu <nigelb@redhat.com> | 2018-09-12 17:52:45 +0530 |
| commit | e16868dede6455cab644805af6fe1ac312775e13 (patch) | |
| tree | 15aebdb4fff2d87cf8a72f836816b3aa634da58d /xlators/meta | |
| parent | 45a71c0548b6fd2c757aa2e7b7671a1411948894 (diff) | |
Land part 2 of clang-format changes
Change-Id: Ia84cc24c8924e6d22d02ac15f611c10e26db99b4
Signed-off-by: Nigel Babu <nigelb@redhat.com>
Diffstat (limited to 'xlators/meta')
30 files changed, 1316 insertions, 1453 deletions
diff --git a/xlators/meta/src/active-link.c b/xlators/meta/src/active-link.c index dfa26b695b3..6c060455887 100644 --- a/xlators/meta/src/active-link.c +++ b/xlators/meta/src/active-link.c @@ -14,26 +14,21 @@ #include "meta-mem-types.h" #include "meta.h" - static int -active_link_fill (xlator_t *this, inode_t *inode, strfd_t *strfd) +active_link_fill(xlator_t *this, inode_t *inode, strfd_t *strfd) { - strprintf (strfd, "%s", this->ctx->active->graph_uuid); + strprintf(strfd, "%s", this->ctx->active->graph_uuid); - return 0; + return 0; } - -struct meta_ops active_link_ops = { - .link_fill = active_link_fill -}; - +struct meta_ops active_link_ops = {.link_fill = active_link_fill}; int -meta_active_link_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_active_link_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &active_link_ops); + meta_ops_set(loc->inode, this, &active_link_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/cmdline-file.c b/xlators/meta/src/cmdline-file.c index 9bf5a65feef..3d6a020ac6c 100644 --- a/xlators/meta/src/cmdline-file.c +++ b/xlators/meta/src/cmdline-file.c @@ -16,27 +16,24 @@ #include "strfd.h" #include "lkowner.h" - static int -cmdline_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +cmdline_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - if (this->ctx->cmdlinestr) - strprintf (strfd, "{ \n \"Cmdlinestr\": \"%s\"\n}", - this->ctx->cmdlinestr); - return strfd->size; + if (this->ctx->cmdlinestr) + strprintf(strfd, "{ \n \"Cmdlinestr\": \"%s\"\n}", + this->ctx->cmdlinestr); + return strfd->size; } - static struct meta_ops cmdline_file_ops = { - .file_fill = cmdline_file_fill, + .file_fill = cmdline_file_fill, }; - int -meta_cmdline_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_cmdline_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &cmdline_file_ops); + meta_ops_set(loc->inode, this, &cmdline_file_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/frames-file.c b/xlators/meta/src/frames-file.c index 4785c6dea31..1316aa71ce8 100644 --- a/xlators/meta/src/frames-file.c +++ b/xlators/meta/src/frames-file.c @@ -17,100 +17,90 @@ #include "lkowner.h" static int -frames_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +frames_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - struct call_pool *pool = NULL; - call_stack_t *stack = NULL; - call_frame_t *frame = NULL; - int i = 0; - int j = 1; + struct call_pool *pool = NULL; + call_stack_t *stack = NULL; + call_frame_t *frame = NULL; + int i = 0; + int j = 1; - if (!this || !file || !strfd) - return -1; + if (!this || !file || !strfd) + return -1; - pool = this->ctx->pool; + pool = this->ctx->pool; - LOCK (&pool->lock); + LOCK(&pool->lock); + { + strprintf(strfd, "{ \n\t\"Stack\": [\n"); + list_for_each_entry(stack, &pool->all_frames, all_frames) { - strprintf (strfd, "{ \n\t\"Stack\": [\n"); - list_for_each_entry (stack, &pool->all_frames, all_frames) { - strprintf (strfd, "\t {\n"); - strprintf (strfd, "\t\t\"Number\": %d,\n", ++i); - strprintf (strfd, "\t\t\"Frame\": [\n"); - j = 1; - list_for_each_entry (frame, &stack->myframes, frames) { - strprintf (strfd, "\t\t {\n"); - strprintf (strfd, "\t\t\t\"Number\": %d,\n", - j++); - strprintf (strfd, - "\t\t\t\"Xlator\": \"%s\",\n", - frame->this->name); - if (frame->begin.tv_sec) - strprintf (strfd, - "\t\t\t\"Creation_time\": %d.%09d,\n", - (int)frame->begin.tv_sec, - (int)frame->begin.tv_nsec); - strprintf (strfd, " \t\t\t\"Refcount\": %d,\n", - frame->ref_count); - if (frame->parent) - strprintf (strfd, "\t\t\t\"Parent\": \"%s\",\n", - frame->parent->this->name); - if (frame->wind_from) - strprintf (strfd, "\t\t\t\"Wind_from\": \"%s\",\n", - frame->wind_from); - if (frame->wind_to) - strprintf (strfd, "\t\t\t\"Wind_to\": \"%s\",\n", - frame->wind_to); - if (frame->unwind_from) - strprintf (strfd, "\t\t\t\"Unwind_from\": \"%s\",\n", - frame->unwind_from); - if (frame->unwind_to) - strprintf (strfd, "\t\t\t\"Unwind_to\": \"%s\",\n", - frame->unwind_to); - strprintf (strfd, "\t\t\t\"Complete\": %d\n", - frame->complete); - if (list_is_last (&frame->frames, - &stack->myframes)) - strprintf (strfd, "\t\t }\n"); - else - strprintf (strfd, "\t\t },\n"); - } - strprintf (strfd, "\t\t],\n"); - strprintf (strfd, "\t\t\"Unique\": %"PRId64",\n", - stack->unique); - strprintf (strfd, "\t\t\"Type\": \"%s\",\n", - gf_fop_list[stack->op]); - strprintf (strfd, "\t\t\"UID\": %d,\n", - stack->uid); - strprintf (strfd, "\t\t\"GID\": %d,\n", - stack->gid); - strprintf (strfd, "\t\t\"LK_owner\": \"%s\"\n", - lkowner_utoa (&stack->lk_owner)); - if (i == (int)pool->cnt) - strprintf (strfd, "\t }\n"); - else - strprintf (strfd, "\t },\n"); - } - strprintf (strfd, "\t],\n"); - strprintf (strfd, "\t\"Call_Count\": %d\n", - (int)pool->cnt); - strprintf (strfd, "}"); + strprintf(strfd, "\t {\n"); + strprintf(strfd, "\t\t\"Number\": %d,\n", ++i); + strprintf(strfd, "\t\t\"Frame\": [\n"); + j = 1; + list_for_each_entry(frame, &stack->myframes, frames) + { + strprintf(strfd, "\t\t {\n"); + strprintf(strfd, "\t\t\t\"Number\": %d,\n", j++); + strprintf(strfd, "\t\t\t\"Xlator\": \"%s\",\n", + frame->this->name); + if (frame->begin.tv_sec) + strprintf(strfd, "\t\t\t\"Creation_time\": %d.%09d,\n", + (int)frame->begin.tv_sec, + (int)frame->begin.tv_nsec); + strprintf(strfd, " \t\t\t\"Refcount\": %d,\n", + frame->ref_count); + if (frame->parent) + strprintf(strfd, "\t\t\t\"Parent\": \"%s\",\n", + frame->parent->this->name); + if (frame->wind_from) + strprintf(strfd, "\t\t\t\"Wind_from\": \"%s\",\n", + frame->wind_from); + if (frame->wind_to) + strprintf(strfd, "\t\t\t\"Wind_to\": \"%s\",\n", + frame->wind_to); + if (frame->unwind_from) + strprintf(strfd, "\t\t\t\"Unwind_from\": \"%s\",\n", + frame->unwind_from); + if (frame->unwind_to) + strprintf(strfd, "\t\t\t\"Unwind_to\": \"%s\",\n", + frame->unwind_to); + strprintf(strfd, "\t\t\t\"Complete\": %d\n", frame->complete); + if (list_is_last(&frame->frames, &stack->myframes)) + strprintf(strfd, "\t\t }\n"); + else + strprintf(strfd, "\t\t },\n"); + } + strprintf(strfd, "\t\t],\n"); + strprintf(strfd, "\t\t\"Unique\": %" PRId64 ",\n", stack->unique); + strprintf(strfd, "\t\t\"Type\": \"%s\",\n", gf_fop_list[stack->op]); + strprintf(strfd, "\t\t\"UID\": %d,\n", stack->uid); + strprintf(strfd, "\t\t\"GID\": %d,\n", stack->gid); + strprintf(strfd, "\t\t\"LK_owner\": \"%s\"\n", + lkowner_utoa(&stack->lk_owner)); + if (i == (int)pool->cnt) + strprintf(strfd, "\t }\n"); + else + strprintf(strfd, "\t },\n"); } - UNLOCK (&pool->lock); + strprintf(strfd, "\t],\n"); + strprintf(strfd, "\t\"Call_Count\": %d\n", (int)pool->cnt); + strprintf(strfd, "}"); + } + UNLOCK(&pool->lock); - return strfd->size; + return strfd->size; } - static struct meta_ops frames_file_ops = { - .file_fill = frames_file_fill, + .file_fill = frames_file_fill, }; - int -meta_frames_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_frames_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &frames_file_ops); - return 0; + meta_ops_set(loc->inode, this, &frames_file_ops); + return 0; } diff --git a/xlators/meta/src/graph-dir.c b/xlators/meta/src/graph-dir.c index c3a6e8b78e1..606fea904be 100644 --- a/xlators/meta/src/graph-dir.c +++ b/xlators/meta/src/graph-dir.c @@ -15,87 +15,84 @@ #include "meta.h" #include "meta-hooks.h" - static struct meta_dirent graph_dir_dirents[] = { - DOT_DOTDOT, - - { .name = "top", - .type = IA_IFLNK, - .hook = meta_top_link_hook, - }, - { .name = "volfile", - .type = IA_IFREG, - .hook = meta_volfile_file_hook, - }, - { .name = NULL } -}; - + DOT_DOTDOT, + + { + .name = "top", + .type = IA_IFLNK, + .hook = meta_top_link_hook, + }, + { + .name = "volfile", + .type = IA_IFREG, + .hook = meta_volfile_file_hook, + }, + {.name = NULL}}; static int -graph_dir_fill (xlator_t *this, inode_t *inode, struct meta_dirent **dp) +graph_dir_fill(xlator_t *this, inode_t *inode, struct meta_dirent **dp) { - struct meta_dirent *dirents = NULL; - glusterfs_graph_t *graph = NULL; - int i = 0; - int count = 0; - xlator_t *xl = NULL; - - graph = meta_ctx_get (inode, this); - - for (xl = graph->first; xl; xl = xl->next) - count++; - - dirents = GF_MALLOC (sizeof (*dirents) * count, gf_meta_mt_dirents_t); - if (!dirents) - return -1; - - i = 0; - for (xl = graph->first; xl; xl = xl->next) { - dirents[i].name = gf_strdup (xl->name); - dirents[i].type = IA_IFDIR; - dirents[i].hook = meta_xlator_dir_hook; - i++; - } - - *dp = dirents; - return i; + struct meta_dirent *dirents = NULL; + glusterfs_graph_t *graph = NULL; + int i = 0; + int count = 0; + xlator_t *xl = NULL; + + graph = meta_ctx_get(inode, this); + + for (xl = graph->first; xl; xl = xl->next) + count++; + + dirents = GF_MALLOC(sizeof(*dirents) * count, gf_meta_mt_dirents_t); + if (!dirents) + return -1; + + i = 0; + for (xl = graph->first; xl; xl = xl->next) { + dirents[i].name = gf_strdup(xl->name); + dirents[i].type = IA_IFDIR; + dirents[i].hook = meta_xlator_dir_hook; + i++; + } + + *dp = dirents; + return i; } - struct meta_ops graph_dir_ops = { - .fixed_dirents = graph_dir_dirents, - .dir_fill = graph_dir_fill, + .fixed_dirents = graph_dir_dirents, + .dir_fill = graph_dir_fill, }; - static glusterfs_graph_t * -glusterfs_graph_lookup (xlator_t *this, const char *graph_uuid) +glusterfs_graph_lookup(xlator_t *this, const char *graph_uuid) { - glusterfs_graph_t *graph = NULL; - glusterfs_graph_t *tmp = NULL; - - list_for_each_entry (tmp, &this->ctx->graphs, list) { - if (strcmp (graph_uuid, tmp->graph_uuid) == 0) { - graph = tmp; - break; - } - } - - return graph; + glusterfs_graph_t *graph = NULL; + glusterfs_graph_t *tmp = NULL; + + list_for_each_entry(tmp, &this->ctx->graphs, list) + { + if (strcmp(graph_uuid, tmp->graph_uuid) == 0) { + graph = tmp; + break; + } + } + + return graph; } - int -meta_graph_dir_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_graph_dir_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - glusterfs_graph_t *graph = NULL; + glusterfs_graph_t *graph = NULL; - graph = glusterfs_graph_lookup (this, loc->name); + graph = glusterfs_graph_lookup(this, loc->name); - meta_ops_set (loc->inode, this, &graph_dir_ops); + meta_ops_set(loc->inode, this, &graph_dir_ops); - meta_ctx_set (loc->inode, this, (void *) graph); + meta_ctx_set(loc->inode, this, (void *)graph); - return 0; + return 0; } diff --git a/xlators/meta/src/graphs-dir.c b/xlators/meta/src/graphs-dir.c index e5f1319ec26..7c8f4276c03 100644 --- a/xlators/meta/src/graphs-dir.c +++ b/xlators/meta/src/graphs-dir.c @@ -15,60 +15,53 @@ #include "meta.h" #include "meta-hooks.h" - static struct meta_dirent graphs_dir_dirents[] = { - DOT_DOTDOT, - - { .name = "active", - .type = IA_IFLNK, - .hook = meta_active_link_hook, - }, - { .name = NULL } -}; + DOT_DOTDOT, + { + .name = "active", + .type = IA_IFLNK, + .hook = meta_active_link_hook, + }, + {.name = NULL}}; static int -graphs_dir_fill (xlator_t *this, inode_t *dir, struct meta_dirent **dp) +graphs_dir_fill(xlator_t *this, inode_t *dir, struct meta_dirent **dp) { - glusterfs_graph_t *graph = NULL; - int graphs_count = 0; - int i = 0; - struct meta_dirent *dirents = NULL; - - list_for_each_entry (graph, &this->ctx->graphs, list) { - graphs_count++; - } - - dirents = GF_CALLOC (sizeof (*dirents), graphs_count + 3, - gf_meta_mt_dirents_t); - if (!dirents) - return -1; - - i = 0; - list_for_each_entry (graph, &this->ctx->graphs, list) { - dirents[i].name = gf_strdup (graph->graph_uuid); - dirents[i].type = IA_IFDIR; - dirents[i].hook = meta_graph_dir_hook; - i++; - } - - *dp = dirents; - - return i; + glusterfs_graph_t *graph = NULL; + int graphs_count = 0; + int i = 0; + struct meta_dirent *dirents = NULL; + + list_for_each_entry(graph, &this->ctx->graphs, list) { graphs_count++; } + + dirents = GF_CALLOC(sizeof(*dirents), graphs_count + 3, + gf_meta_mt_dirents_t); + if (!dirents) + return -1; + + i = 0; + list_for_each_entry(graph, &this->ctx->graphs, list) + { + dirents[i].name = gf_strdup(graph->graph_uuid); + dirents[i].type = IA_IFDIR; + dirents[i].hook = meta_graph_dir_hook; + i++; + } + + *dp = dirents; + + return i; } - -struct meta_ops graphs_dir_ops = { - .fixed_dirents = graphs_dir_dirents, - .dir_fill = graphs_dir_fill -}; - +struct meta_ops graphs_dir_ops = {.fixed_dirents = graphs_dir_dirents, + .dir_fill = graphs_dir_fill}; int -meta_graphs_dir_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_graphs_dir_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &graphs_dir_ops); + meta_ops_set(loc->inode, this, &graphs_dir_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/history-file.c b/xlators/meta/src/history-file.c index eadc9821f83..a78fe27a54a 100644 --- a/xlators/meta/src/history-file.c +++ b/xlators/meta/src/history-file.c @@ -16,32 +16,29 @@ #include "strfd.h" #include "statedump.h" - static int -history_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +history_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - xlator_t *xl = NULL; + xlator_t *xl = NULL; - xl = meta_ctx_get (file, this); + xl = meta_ctx_get(file, this); - gf_proc_dump_xlator_history (xl, strfd); + gf_proc_dump_xlator_history(xl, strfd); - return strfd->size; + return strfd->size; } - static struct meta_ops history_file_ops = { - .file_fill = history_file_fill, + .file_fill = history_file_fill, }; - int -meta_history_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_history_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &history_file_ops); + meta_ops_set(loc->inode, this, &history_file_ops); - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - return 0; + return 0; } diff --git a/xlators/meta/src/logfile-link.c b/xlators/meta/src/logfile-link.c index d7b16b92eae..61cd4fee852 100644 --- a/xlators/meta/src/logfile-link.c +++ b/xlators/meta/src/logfile-link.c @@ -14,26 +14,21 @@ #include "meta-mem-types.h" #include "meta.h" - static int -logfile_link_fill (xlator_t *this, inode_t *inode, strfd_t *strfd) +logfile_link_fill(xlator_t *this, inode_t *inode, strfd_t *strfd) { - strprintf (strfd, "%s", this->ctx->log.filename); + strprintf(strfd, "%s", this->ctx->log.filename); - return 0; + return 0; } - -struct meta_ops logfile_link_ops = { - .link_fill = logfile_link_fill -}; - +struct meta_ops logfile_link_ops = {.link_fill = logfile_link_fill}; int -meta_logfile_link_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_logfile_link_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &logfile_link_ops); + meta_ops_set(loc->inode, this, &logfile_link_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/logging-dir.c b/xlators/meta/src/logging-dir.c index cfd0c123308..590b5532b38 100644 --- a/xlators/meta/src/logging-dir.c +++ b/xlators/meta/src/logging-dir.c @@ -15,32 +15,30 @@ #include "meta.h" #include "meta-hooks.h" - static struct meta_dirent logging_dir_dirents[] = { - DOT_DOTDOT, - - { .name = "logfile", - .type = IA_IFLNK, - .hook = meta_logfile_link_hook, - }, - { .name = "loglevel", - .type = IA_IFREG, - .hook = meta_loglevel_file_hook, - }, - { .name = NULL } -}; - + DOT_DOTDOT, + + { + .name = "logfile", + .type = IA_IFLNK, + .hook = meta_logfile_link_hook, + }, + { + .name = "loglevel", + .type = IA_IFREG, + .hook = meta_loglevel_file_hook, + }, + {.name = NULL}}; struct meta_ops logging_dir_ops = { - .fixed_dirents = logging_dir_dirents, + .fixed_dirents = logging_dir_dirents, }; - int -meta_logging_dir_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_logging_dir_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &logging_dir_ops); + meta_ops_set(loc->inode, this, &logging_dir_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/loglevel-file.c b/xlators/meta/src/loglevel-file.c index 4399da2c948..3f3f2707dc0 100644 --- a/xlators/meta/src/loglevel-file.c +++ b/xlators/meta/src/loglevel-file.c @@ -15,40 +15,36 @@ #include "meta.h" #include "strfd.h" - static int -loglevel_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +loglevel_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - strprintf (strfd, "%d\n", this->ctx->log.loglevel); + strprintf(strfd, "%d\n", this->ctx->log.loglevel); - return strfd->size; + return strfd->size; } - static int -loglevel_file_write (xlator_t *this, fd_t *fd, struct iovec *iov, int count) +loglevel_file_write(xlator_t *this, fd_t *fd, struct iovec *iov, int count) { - long int level = -1; + long int level = -1; - level = strtol (iov[0].iov_base, NULL, 0); - if (level >= GF_LOG_NONE && level <= GF_LOG_TRACE) - gf_log_set_loglevel (this->ctx, level); + level = strtol(iov[0].iov_base, NULL, 0); + if (level >= GF_LOG_NONE && level <= GF_LOG_TRACE) + gf_log_set_loglevel(this->ctx, level); - return iov_length (iov, count); + return iov_length(iov, count); } - static struct meta_ops loglevel_file_ops = { - .file_fill = loglevel_file_fill, - .file_write = loglevel_file_write, + .file_fill = loglevel_file_fill, + .file_write = loglevel_file_write, }; - int -meta_loglevel_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_loglevel_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &loglevel_file_ops); + meta_ops_set(loc->inode, this, &loglevel_file_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/mallinfo-file.c b/xlators/meta/src/mallinfo-file.c index a1aec25e3a6..d04fe9f4c1e 100644 --- a/xlators/meta/src/mallinfo-file.c +++ b/xlators/meta/src/mallinfo-file.c @@ -15,25 +15,22 @@ #include "meta.h" #include "statedump.h" - static int -mallinfo_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +mallinfo_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - gf_proc_dump_mallinfo (strfd); - return strfd->size; + gf_proc_dump_mallinfo(strfd); + return strfd->size; } - static struct meta_ops mallinfo_file_ops = { - .file_fill = mallinfo_file_fill, + .file_fill = mallinfo_file_fill, }; - int -meta_mallinfo_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_mallinfo_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &mallinfo_file_ops); + meta_ops_set(loc->inode, this, &mallinfo_file_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/measure-file.c b/xlators/meta/src/measure-file.c index 7fe9ff390c0..1529608bb25 100644 --- a/xlators/meta/src/measure-file.c +++ b/xlators/meta/src/measure-file.c @@ -15,38 +15,35 @@ #include "meta.h" #include "strfd.h" - static int -measure_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +measure_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - strprintf (strfd, "%d\n", this->ctx->measure_latency); + strprintf(strfd, "%d\n", this->ctx->measure_latency); - return strfd->size; + return strfd->size; } - static int -measure_file_write (xlator_t *this, fd_t *fd, struct iovec *iov, int count) +measure_file_write(xlator_t *this, fd_t *fd, struct iovec *iov, int count) { - long int num = -1; + long int num = -1; - num = strtol (iov[0].iov_base, NULL, 0); - this->ctx->measure_latency = !!num; + num = strtol(iov[0].iov_base, NULL, 0); + this->ctx->measure_latency = !!num; - return iov_length (iov, count); + return iov_length(iov, count); } static struct meta_ops measure_file_ops = { - .file_fill = measure_file_fill, - .file_write = measure_file_write, + .file_fill = measure_file_fill, + .file_write = measure_file_write, }; - int -meta_measure_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_measure_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &measure_file_ops); + meta_ops_set(loc->inode, this, &measure_file_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/meminfo-file.c b/xlators/meta/src/meminfo-file.c index 900976ada3b..d6122ae5013 100644 --- a/xlators/meta/src/meminfo-file.c +++ b/xlators/meta/src/meminfo-file.c @@ -16,32 +16,29 @@ #include "strfd.h" #include "statedump.h" - static int -meminfo_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +meminfo_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - xlator_t *xl = NULL; + xlator_t *xl = NULL; - xl = meta_ctx_get (file, this); + xl = meta_ctx_get(file, this); - gf_proc_dump_xlator_meminfo (xl, strfd); + gf_proc_dump_xlator_meminfo(xl, strfd); - return strfd->size; + return strfd->size; } - static struct meta_ops meminfo_file_ops = { - .file_fill = meminfo_file_fill, + .file_fill = meminfo_file_fill, }; - int -meta_meminfo_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_meminfo_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &meminfo_file_ops); + meta_ops_set(loc->inode, this, &meminfo_file_ops); - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - return 0; + return 0; } diff --git a/xlators/meta/src/meta-defaults.c b/xlators/meta/src/meta-defaults.c index 045fe79dbbc..8b0d786483f 100644 --- a/xlators/meta/src/meta-defaults.c +++ b/xlators/meta/src/meta-defaults.c @@ -17,625 +17,638 @@ #include "compat-errno.h" int -meta_default_fgetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, - const char *name, dict_t *xdata) +meta_default_fgetxattr(call_frame_t *frame, xlator_t *this, fd_t *fd, + const char *name, dict_t *xdata) { - return default_fgetxattr_failure_cbk (frame, EPERM); + return default_fgetxattr_failure_cbk(frame, EPERM); } int -meta_default_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, - dict_t *dict, int32_t flags, dict_t *xdata) +meta_default_fsetxattr(call_frame_t *frame, xlator_t *this, fd_t *fd, + dict_t *dict, int32_t flags, dict_t *xdata) { - return default_fsetxattr_failure_cbk (frame, EPERM); + return default_fsetxattr_failure_cbk(frame, EPERM); } int -meta_default_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *dict, int32_t flags, dict_t *xdata) +meta_default_setxattr(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *dict, int32_t flags, dict_t *xdata) { - return default_setxattr_failure_cbk (frame, EPERM); + return default_setxattr_failure_cbk(frame, EPERM); } int -meta_default_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_default_statfs(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - return default_statfs_failure_cbk (frame, EPERM); + return default_statfs_failure_cbk(frame, EPERM); } int -meta_default_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd, - int32_t flags, dict_t *xdata) +meta_default_fsyncdir(call_frame_t *frame, xlator_t *this, fd_t *fd, + int32_t flags, dict_t *xdata) { - return default_fsyncdir_failure_cbk (frame, EPERM); + return default_fsyncdir_failure_cbk(frame, EPERM); } int -meta_default_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, - fd_t *fd, dict_t *xdata) +meta_default_opendir(call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, + dict_t *xdata) { - META_STACK_UNWIND (opendir, frame, 0, 0, fd, xdata); - return 0; + META_STACK_UNWIND(opendir, frame, 0, 0, fd, xdata); + return 0; } int -meta_default_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd, - dict_t *xdata) +meta_default_fstat(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) { - struct iatt iatt = { }; + struct iatt iatt = {}; - meta_iatt_fill (&iatt, fd->inode, fd->inode->ia_type); + meta_iatt_fill(&iatt, fd->inode, fd->inode->ia_type); - META_STACK_UNWIND (fstat, frame, 0, 0, &iatt, xdata); + META_STACK_UNWIND(fstat, frame, 0, 0, &iatt, xdata); - return 0; + return 0; } int -meta_default_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd, - int32_t flags, dict_t *xdata) +meta_default_fsync(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, + dict_t *xdata) { - return default_fsync_failure_cbk (frame, EPERM); + return default_fsync_failure_cbk(frame, EPERM); } int -meta_default_flush (call_frame_t *frame, xlator_t *this, fd_t *fd, - dict_t *xdata) +meta_default_flush(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) { - META_STACK_UNWIND (flush, frame, 0, 0, xdata); - return 0; + META_STACK_UNWIND(flush, frame, 0, 0, xdata); + return 0; } int -meta_default_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, - struct iovec *vector, int32_t count, off_t off, - uint32_t flags, struct iobref *iobref, dict_t *xdata) +meta_default_writev(call_frame_t *frame, xlator_t *this, fd_t *fd, + struct iovec *vector, int32_t count, off_t off, + uint32_t flags, struct iobref *iobref, dict_t *xdata) { - struct meta_ops *ops = NULL; - int ret = 0; - struct iatt dummy = { }; + struct meta_ops *ops = NULL; + int ret = 0; + struct iatt dummy = {}; - ops = meta_ops_get (fd->inode, this); - if (!ops) - goto err; + ops = meta_ops_get(fd->inode, this); + if (!ops) + goto err; - if (!ops->file_write) - goto err; + if (!ops->file_write) + goto err; - ret = ops->file_write (this, fd, vector, count); + ret = ops->file_write(this, fd, vector, count); - META_STACK_UNWIND (writev, frame, (ret >= 0 ? ret : -1), (ret < 0 ? -ret : 0), - &dummy, &dummy, xdata); - return 0; + META_STACK_UNWIND(writev, frame, (ret >= 0 ? ret : -1), + (ret < 0 ? -ret : 0), &dummy, &dummy, xdata); + return 0; err: - return default_writev_failure_cbk (frame, EPERM); + return default_writev_failure_cbk(frame, EPERM); } int -meta_default_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - off_t offset, uint32_t flags, dict_t *xdata) +meta_default_readv(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, + off_t offset, uint32_t flags, dict_t *xdata) { - meta_fd_t *meta_fd = NULL; - struct iovec iov = {}; - struct iobuf *iobuf = NULL; - struct iobref *iobref = NULL; - off_t copy_offset = 0; - size_t copy_size = 0; - struct iatt iatt = {}; + meta_fd_t *meta_fd = NULL; + struct iovec iov = {}; + struct iobuf *iobuf = NULL; + struct iobref *iobref = NULL; + off_t copy_offset = 0; + size_t copy_size = 0; + struct iatt iatt = {}; + meta_fd = meta_fd_get(fd, this); + if (!meta_fd) + return default_readv_failure_cbk(frame, ENODATA); - meta_fd = meta_fd_get (fd, this); - if (!meta_fd) - return default_readv_failure_cbk (frame, ENODATA); + if (!meta_fd->size) + meta_file_fill(this, fd); - if (!meta_fd->size) - meta_file_fill (this, fd); + iobuf = iobuf_get2(this->ctx->iobuf_pool, size); + if (!iobuf) + return default_readv_failure_cbk(frame, ENOMEM); - iobuf = iobuf_get2 (this->ctx->iobuf_pool, size); - if (!iobuf) - return default_readv_failure_cbk (frame, ENOMEM); + iobref = iobref_new(); + if (!iobref) { + iobuf_unref(iobuf); + return default_readv_failure_cbk(frame, ENOMEM); + } - iobref = iobref_new (); - if (!iobref) { - iobuf_unref (iobuf); - return default_readv_failure_cbk (frame, ENOMEM); - } + if (iobref_add(iobref, iobuf) != 0) { + iobref_unref(iobref); + iobuf_unref(iobuf); + return default_readv_failure_cbk(frame, ENOMEM); + } - if (iobref_add (iobref, iobuf) != 0) { - iobref_unref (iobref); - iobuf_unref (iobuf); - return default_readv_failure_cbk (frame, ENOMEM); - } + /* iobref would have taken a ref */ + iobuf_unref(iobuf); - /* iobref would have taken a ref */ - iobuf_unref (iobuf); + iov.iov_base = iobuf_ptr(iobuf); - iov.iov_base = iobuf_ptr (iobuf); + copy_offset = min(meta_fd->size, offset); + copy_size = min(size, (meta_fd->size - copy_offset)); - copy_offset = min (meta_fd->size, offset); - copy_size = min (size, (meta_fd->size - copy_offset)); + if (copy_size) + memcpy(iov.iov_base, meta_fd->data + copy_offset, copy_size); + iov.iov_len = copy_size; - if (copy_size) - memcpy (iov.iov_base, meta_fd->data + copy_offset, copy_size); - iov.iov_len = copy_size; + META_STACK_UNWIND(readv, frame, copy_size, 0, &iov, 1, &iatt, iobref, 0); - META_STACK_UNWIND (readv, frame, copy_size, 0, &iov, 1, &iatt, iobref, 0); + iobref_unref(iobref); - iobref_unref (iobref); - - return 0; + return 0; } - int -meta_default_open (call_frame_t *frame, xlator_t *this, loc_t *loc, - int32_t flags, fd_t *fd, dict_t *xdata) +meta_default_open(call_frame_t *frame, xlator_t *this, loc_t *loc, + int32_t flags, fd_t *fd, dict_t *xdata) { - dict_t *xdata_rsp = NULL; + dict_t *xdata_rsp = NULL; - xdata_rsp = meta_direct_io_mode (xdata, frame); + xdata_rsp = meta_direct_io_mode(xdata, frame); - META_STACK_UNWIND (open, frame, 0, 0, fd, xdata_rsp); + META_STACK_UNWIND(open, frame, 0, 0, fd, xdata_rsp); - return 0; + return 0; } int -meta_default_create (call_frame_t *frame, xlator_t *this, loc_t *loc, - int32_t flags, mode_t mode, mode_t umask, fd_t *fd, - dict_t *xdata) +meta_default_create(call_frame_t *frame, xlator_t *this, loc_t *loc, + int32_t flags, mode_t mode, mode_t umask, fd_t *fd, + dict_t *xdata) { - return default_create_failure_cbk (frame, EPERM); + return default_create_failure_cbk(frame, EPERM); } int -meta_default_link (call_frame_t *frame, xlator_t *this, loc_t *oldloc, - loc_t *newloc, dict_t *xdata) +meta_default_link(call_frame_t *frame, xlator_t *this, loc_t *oldloc, + loc_t *newloc, dict_t *xdata) { - return default_link_failure_cbk (frame, EPERM); + return default_link_failure_cbk(frame, EPERM); } int -meta_default_rename (call_frame_t *frame, xlator_t *this, loc_t *oldloc, - loc_t *newloc, dict_t *xdata) +meta_default_rename(call_frame_t *frame, xlator_t *this, loc_t *oldloc, + loc_t *newloc, dict_t *xdata) { - return default_rename_failure_cbk (frame, EPERM); + return default_rename_failure_cbk(frame, EPERM); } int -meta_default_symlink (call_frame_t *frame, xlator_t *this, const char *linkpath, - loc_t *loc, mode_t umask, dict_t *xdata) +meta_default_symlink(call_frame_t *frame, xlator_t *this, const char *linkpath, + loc_t *loc, mode_t umask, dict_t *xdata) { - return default_symlink_failure_cbk (frame, EPERM); + return default_symlink_failure_cbk(frame, EPERM); } int -meta_default_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags, - dict_t *xdata) +meta_default_rmdir(call_frame_t *frame, xlator_t *this, loc_t *loc, int flags, + dict_t *xdata) { - return default_rmdir_failure_cbk (frame, EPERM); + return default_rmdir_failure_cbk(frame, EPERM); } int -meta_default_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag, - dict_t *xdata) +meta_default_unlink(call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag, + dict_t *xdata) { - return default_unlink_failure_cbk (frame, EPERM); + return default_unlink_failure_cbk(frame, EPERM); } int -meta_default_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, - mode_t mode, mode_t umask, dict_t *xdata) +meta_default_mkdir(call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode, + mode_t umask, dict_t *xdata) { - return default_mkdir_failure_cbk (frame, EPERM); + return default_mkdir_failure_cbk(frame, EPERM); } int -meta_default_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, - mode_t mode, dev_t rdev, mode_t umask, dict_t *xdata) +meta_default_mknod(call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode, + dev_t rdev, mode_t umask, dict_t *xdata) { - return default_mknod_failure_cbk (frame, EPERM); + return default_mknod_failure_cbk(frame, EPERM); } int -meta_default_readlink (call_frame_t *frame, xlator_t *this, loc_t *loc, - size_t size, dict_t *xdata) +meta_default_readlink(call_frame_t *frame, xlator_t *this, loc_t *loc, + size_t size, dict_t *xdata) { - struct meta_ops *ops = NULL; - strfd_t *strfd = NULL; - struct iatt iatt = { }; + struct meta_ops *ops = NULL; + strfd_t *strfd = NULL; + struct iatt iatt = {}; - ops = meta_ops_get (loc->inode, this); - if (!ops->link_fill) { - META_STACK_UNWIND (readlink, frame, -1, EPERM, 0, 0, 0); - return 0; - } + ops = meta_ops_get(loc->inode, this); + if (!ops->link_fill) { + META_STACK_UNWIND(readlink, frame, -1, EPERM, 0, 0, 0); + return 0; + } - strfd = strfd_open (); - if (!strfd) { - META_STACK_UNWIND (readlink, frame, -1, ENOMEM, 0, 0, 0); - return 0; - } + strfd = strfd_open(); + if (!strfd) { + META_STACK_UNWIND(readlink, frame, -1, ENOMEM, 0, 0, 0); + return 0; + } - ops->link_fill (this, loc->inode, strfd); + ops->link_fill(this, loc->inode, strfd); - meta_iatt_fill (&iatt, loc->inode, IA_IFLNK); + meta_iatt_fill(&iatt, loc->inode, IA_IFLNK); - if (strfd->data) - META_STACK_UNWIND (readlink, frame, strlen (strfd->data), 0, - strfd->data, &iatt, xdata); - else - META_STACK_UNWIND (readlink, frame, -1, ENODATA, 0, 0, 0); + if (strfd->data) + META_STACK_UNWIND(readlink, frame, strlen(strfd->data), 0, strfd->data, + &iatt, xdata); + else + META_STACK_UNWIND(readlink, frame, -1, ENODATA, 0, 0, 0); - strfd_close (strfd); + strfd_close(strfd); - return 0; + return 0; } int -meta_default_access (call_frame_t *frame, xlator_t *this, loc_t *loc, - int32_t mask, dict_t *xdata) +meta_default_access(call_frame_t *frame, xlator_t *this, loc_t *loc, + int32_t mask, dict_t *xdata) { - return default_access_failure_cbk (frame, EPERM); + return default_access_failure_cbk(frame, EPERM); } int -meta_default_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, - off_t offset, dict_t *xdata) +meta_default_ftruncate(call_frame_t *frame, xlator_t *this, fd_t *fd, + off_t offset, dict_t *xdata) { - struct iatt iatt = { }; + struct iatt iatt = {}; - meta_iatt_fill (&iatt, fd->inode, IA_IFREG); + meta_iatt_fill(&iatt, fd->inode, IA_IFREG); - META_STACK_UNWIND (ftruncate, frame, 0, 0, &iatt, &iatt, xdata); + META_STACK_UNWIND(ftruncate, frame, 0, 0, &iatt, &iatt, xdata); - return 0; + return 0; } int -meta_default_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, - const char *name, dict_t *xdata) +meta_default_getxattr(call_frame_t *frame, xlator_t *this, loc_t *loc, + const char *name, dict_t *xdata) { - return default_getxattr_failure_cbk (frame, EPERM); + return default_getxattr_failure_cbk(frame, EPERM); } int -meta_default_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc, - gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata) +meta_default_xattrop(call_frame_t *frame, xlator_t *this, loc_t *loc, + gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata) { - return default_xattrop_failure_cbk (frame, EPERM); + return default_xattrop_failure_cbk(frame, EPERM); } int -meta_default_fxattrop (call_frame_t *frame, xlator_t *this, fd_t *fd, - gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata) +meta_default_fxattrop(call_frame_t *frame, xlator_t *this, fd_t *fd, + gf_xattrop_flags_t flags, dict_t *dict, dict_t *xdata) { - return default_fxattrop_failure_cbk (frame, EPERM); + return default_fxattrop_failure_cbk(frame, EPERM); } int -meta_default_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc, - const char *name, dict_t *xdata) +meta_default_removexattr(call_frame_t *frame, xlator_t *this, loc_t *loc, + const char *name, dict_t *xdata) { - return default_removexattr_failure_cbk (frame, EPERM); + return default_removexattr_failure_cbk(frame, EPERM); } int -meta_default_fremovexattr (call_frame_t *frame, xlator_t *this, fd_t *fd, - const char *name, dict_t *xdata) +meta_default_fremovexattr(call_frame_t *frame, xlator_t *this, fd_t *fd, + const char *name, dict_t *xdata) { - return default_fremovexattr_failure_cbk (frame, EPERM); + return default_fremovexattr_failure_cbk(frame, EPERM); } int -meta_default_lk (call_frame_t *frame, xlator_t *this, fd_t *fd, - int32_t cmd, struct gf_flock *lock, dict_t *xdata) +meta_default_lk(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd, + struct gf_flock *lock, dict_t *xdata) { - return default_lk_failure_cbk (frame, EPERM); + return default_lk_failure_cbk(frame, EPERM); } - int -meta_default_inodelk (call_frame_t *frame, xlator_t *this, const char *volume, - loc_t *loc, int32_t cmd, struct gf_flock *lock, - dict_t *xdata) +meta_default_inodelk(call_frame_t *frame, xlator_t *this, const char *volume, + loc_t *loc, int32_t cmd, struct gf_flock *lock, + dict_t *xdata) { - return default_inodelk_failure_cbk (frame, EPERM); + return default_inodelk_failure_cbk(frame, EPERM); } int -meta_default_finodelk (call_frame_t *frame, xlator_t *this, const char *volume, - fd_t *fd, int32_t cmd, struct gf_flock *lock, - dict_t *xdata) +meta_default_finodelk(call_frame_t *frame, xlator_t *this, const char *volume, + fd_t *fd, int32_t cmd, struct gf_flock *lock, + dict_t *xdata) { - return default_finodelk_failure_cbk (frame, EPERM); + return default_finodelk_failure_cbk(frame, EPERM); } int -meta_default_entrylk (call_frame_t *frame, xlator_t *this, const char *volume, - loc_t *loc, const char *basename, entrylk_cmd cmd, - entrylk_type type, dict_t *xdata) +meta_default_entrylk(call_frame_t *frame, xlator_t *this, const char *volume, + loc_t *loc, const char *basename, entrylk_cmd cmd, + entrylk_type type, dict_t *xdata) { - return default_entrylk_failure_cbk (frame, EPERM); + return default_entrylk_failure_cbk(frame, EPERM); } int -meta_default_fentrylk (call_frame_t *frame, xlator_t *this, const char *volume, - fd_t *fd, const char *basename, entrylk_cmd cmd, - entrylk_type type, dict_t *xdata) +meta_default_fentrylk(call_frame_t *frame, xlator_t *this, const char *volume, + fd_t *fd, const char *basename, entrylk_cmd cmd, + entrylk_type type, dict_t *xdata) { - return default_fentrylk_failure_cbk (frame, EPERM); + return default_fentrylk_failure_cbk(frame, EPERM); } int -meta_default_rchecksum (call_frame_t *frame, xlator_t *this, fd_t *fd, - off_t offset, int32_t len, dict_t *xdata) +meta_default_rchecksum(call_frame_t *frame, xlator_t *this, fd_t *fd, + off_t offset, int32_t len, dict_t *xdata) { - return default_rchecksum_failure_cbk (frame, EPERM); + return default_rchecksum_failure_cbk(frame, EPERM); } - int -meta_default_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, - size_t size, off_t off, dict_t *xdata) +meta_default_readdir(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, + off_t off, dict_t *xdata) { - meta_fd_t *meta_fd = NULL; - int i = 0; - gf_dirent_t head; - gf_dirent_t *list = NULL; - int ret = 0; - int this_size = 0; - int filled_size = 0; - int fixed_size = 0; - int dyn_size = 0; - struct meta_dirent *fixed_dirents = NULL; - struct meta_dirent *dyn_dirents = NULL; - struct meta_dirent *dirents = NULL; - struct meta_dirent *end = NULL; - struct meta_ops *ops = NULL; - - INIT_LIST_HEAD (&head.list); + meta_fd_t *meta_fd = NULL; + int i = 0; + gf_dirent_t head; + gf_dirent_t *list = NULL; + int ret = 0; + int this_size = 0; + int filled_size = 0; + int fixed_size = 0; + int dyn_size = 0; + struct meta_dirent *fixed_dirents = NULL; + struct meta_dirent *dyn_dirents = NULL; + struct meta_dirent *dirents = NULL; + struct meta_dirent *end = NULL; + struct meta_ops *ops = NULL; - ops = meta_ops_get (fd->inode, this); - if (!ops) - goto err; + INIT_LIST_HEAD(&head.list); - meta_fd = meta_fd_get (fd, this); - if (!meta_fd) - goto err; + ops = meta_ops_get(fd->inode, this); + if (!ops) + goto err; - meta_dir_fill (this, fd); + meta_fd = meta_fd_get(fd, this); + if (!meta_fd) + goto err; - fixed_dirents = ops->fixed_dirents; - fixed_size = fixed_dirents_len (fixed_dirents); + meta_dir_fill(this, fd); - dyn_dirents = meta_fd->dirents; - dyn_size = meta_fd->size; + fixed_dirents = ops->fixed_dirents; + fixed_size = fixed_dirents_len(fixed_dirents); - for (i = off; i < (fixed_size + dyn_size);) { - if (i >= fixed_size) { - dirents = dyn_dirents + (i - fixed_size); - end = dyn_dirents + dyn_size; - } else { - dirents = fixed_dirents + i; - end = fixed_dirents + fixed_size; - } + dyn_dirents = meta_fd->dirents; + dyn_size = meta_fd->size; - while (dirents < end) { - this_size = sizeof (gf_dirent_t) + - strlen (dirents->name) + 1; - if (this_size + filled_size > size) - goto unwind; + for (i = off; i < (fixed_size + dyn_size);) { + if (i >= fixed_size) { + dirents = dyn_dirents + (i - fixed_size); + end = dyn_dirents + dyn_size; + } else { + dirents = fixed_dirents + i; + end = fixed_dirents + fixed_size; + } - list = gf_dirent_for_name (dirents->name); - if (!list) - break; + while (dirents < end) { + this_size = sizeof(gf_dirent_t) + strlen(dirents->name) + 1; + if (this_size + filled_size > size) + goto unwind; - list->d_off = i + 1; - list->d_ino = i + 42; - switch (dirents->type) { - case IA_IFDIR: list->d_type = DT_DIR; break; - case IA_IFCHR: list->d_type = DT_CHR; break; - case IA_IFBLK: list->d_type = DT_BLK; break; - case IA_IFIFO: list->d_type = DT_FIFO; break; - case IA_IFLNK: list->d_type = DT_LNK; break; - case IA_IFREG: list->d_type = DT_REG; break; - case IA_IFSOCK: list->d_type = DT_SOCK; break; - case IA_INVAL: list->d_type = DT_UNKNOWN; break; - } + list = gf_dirent_for_name(dirents->name); + if (!list) + break; - list_add_tail (&list->list, &head.list); - ret++; i++; dirents++; - filled_size += this_size; - } - } + list->d_off = i + 1; + list->d_ino = i + 42; + switch (dirents->type) { + case IA_IFDIR: + list->d_type = DT_DIR; + break; + case IA_IFCHR: + list->d_type = DT_CHR; + break; + case IA_IFBLK: + list->d_type = DT_BLK; + break; + case IA_IFIFO: + list->d_type = DT_FIFO; + break; + case IA_IFLNK: + list->d_type = DT_LNK; + break; + case IA_IFREG: + list->d_type = DT_REG; + break; + case IA_IFSOCK: + list->d_type = DT_SOCK; + break; + case IA_INVAL: + list->d_type = DT_UNKNOWN; + break; + } + + list_add_tail(&list->list, &head.list); + ret++; + i++; + dirents++; + filled_size += this_size; + } + } unwind: - META_STACK_UNWIND (readdir, frame, ret, 0, &head, xdata); + META_STACK_UNWIND(readdir, frame, ret, 0, &head, xdata); - gf_dirent_free (&head); + gf_dirent_free(&head); - return 0; + return 0; err: - META_STACK_UNWIND (readdir, frame, -1, ENOMEM, 0, 0); - return 0; + META_STACK_UNWIND(readdir, frame, -1, ENOMEM, 0, 0); + return 0; } - int -meta_default_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, - size_t size, off_t off, dict_t *xdata) +meta_default_readdirp(call_frame_t *frame, xlator_t *this, fd_t *fd, + size_t size, off_t off, dict_t *xdata) { - return meta_default_readdir (frame, this, fd, size, off, xdata); + return meta_default_readdir(frame, this, fd, size, off, xdata); } int -meta_default_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, - struct iatt *stbuf, int32_t valid, - dict_t *xdata) +meta_default_setattr(call_frame_t *frame, xlator_t *this, loc_t *loc, + struct iatt *stbuf, int32_t valid, dict_t *xdata) { - return default_setattr_failure_cbk (frame, EPERM); + return default_setattr_failure_cbk(frame, EPERM); } int -meta_default_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, - off_t offset, dict_t *xdata) +meta_default_truncate(call_frame_t *frame, xlator_t *this, loc_t *loc, + off_t offset, dict_t *xdata) { - struct iatt iatt = { }; + struct iatt iatt = {}; - meta_iatt_fill (&iatt, loc->inode, IA_IFREG); + meta_iatt_fill(&iatt, loc->inode, IA_IFREG); - META_STACK_UNWIND (truncate, frame, 0, 0, &iatt, &iatt, xdata); + META_STACK_UNWIND(truncate, frame, 0, 0, &iatt, &iatt, xdata); - return 0; + return 0; } int -meta_default_stat (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_default_stat(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - struct iatt iatt = { }; + struct iatt iatt = {}; - meta_iatt_fill (&iatt, loc->inode, loc->inode->ia_type); + meta_iatt_fill(&iatt, loc->inode, loc->inode->ia_type); - META_STACK_UNWIND (stat, frame, 0, 0, &iatt, xdata); + META_STACK_UNWIND(stat, frame, 0, 0, &iatt, xdata); - return 0; + return 0; } int -meta_default_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_default_lookup(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - struct meta_ops *ops = NULL; - struct meta_dirent *dirent = NULL; - struct meta_dirent *dp = NULL; - int i = 0; - int ret = 0; + struct meta_ops *ops = NULL; + struct meta_dirent *dirent = NULL; + struct meta_dirent *dp = NULL; + int i = 0; + int ret = 0; - if (!loc->name) - return meta_inode_discover (frame, this, loc, xdata); + if (!loc->name) + return meta_inode_discover(frame, this, loc, xdata); - ops = meta_ops_get (loc->parent, this); - if (!ops) - return default_lookup_failure_cbk (frame, EPERM); + ops = meta_ops_get(loc->parent, this); + if (!ops) + return default_lookup_failure_cbk(frame, EPERM); - for (dirent = ops->fixed_dirents; dirent && dirent->name; dirent++) { - if (strcmp (dirent->name, loc->name) == 0) - goto hook; - } + for (dirent = ops->fixed_dirents; dirent && dirent->name; dirent++) { + if (strcmp(dirent->name, loc->name) == 0) + goto hook; + } - dirent = NULL; - if (ops->dir_fill) - ret = ops->dir_fill (this, loc->parent, &dp); + dirent = NULL; + if (ops->dir_fill) + ret = ops->dir_fill(this, loc->parent, &dp); - for (i = 0; i < ret; i++) { - if (strcmp (dp[i].name, loc->name) == 0) { - dirent = &dp[i]; - goto hook; - } - } + for (i = 0; i < ret; i++) { + if (strcmp(dp[i].name, loc->name) == 0) { + dirent = &dp[i]; + goto hook; + } + } hook: - if (dirent && dirent->hook) { - struct iatt parent = { }; - struct iatt iatt = { }; + if (dirent && dirent->hook) { + struct iatt parent = {}; + struct iatt iatt = {}; - dirent->hook (frame, this, loc, xdata); + dirent->hook(frame, this, loc, xdata); - meta_iatt_fill (&iatt, loc->inode, dirent->type); + meta_iatt_fill(&iatt, loc->inode, dirent->type); - META_STACK_UNWIND (lookup, frame, 0, 0, loc->inode, &iatt, - xdata, &parent); - } else { - META_STACK_UNWIND (lookup, frame, -1, ENOENT, 0, 0, 0, 0); - } + META_STACK_UNWIND(lookup, frame, 0, 0, loc->inode, &iatt, xdata, + &parent); + } else { + META_STACK_UNWIND(lookup, frame, -1, ENOENT, 0, 0, 0, 0); + } - for (i = 0; i < ret; i++) - GF_FREE ((void *)dp[i].name); - GF_FREE (dp); + for (i = 0; i < ret; i++) + GF_FREE((void *)dp[i].name); + GF_FREE(dp); - return 0; + return 0; } int -meta_default_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd, - struct iatt *stbuf, int32_t valid, dict_t *xdata) +meta_default_fsetattr(call_frame_t *frame, xlator_t *this, fd_t *fd, + struct iatt *stbuf, int32_t valid, dict_t *xdata) { - return default_fsetattr_failure_cbk (frame, EPERM); + return default_fsetattr_failure_cbk(frame, EPERM); } int -meta_default_fallocate (call_frame_t *frame, xlator_t *this, fd_t *fd, - int32_t keep_size, off_t offset, size_t len, - dict_t *xdata) +meta_default_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd, + int32_t keep_size, off_t offset, size_t len, + dict_t *xdata) { - return default_fallocate_failure_cbk (frame, EPERM); + return default_fallocate_failure_cbk(frame, EPERM); } int -meta_default_discard (call_frame_t *frame, xlator_t *this, fd_t *fd, - off_t offset, size_t len, dict_t *xdata) +meta_default_discard(call_frame_t *frame, xlator_t *this, fd_t *fd, + off_t offset, size_t len, dict_t *xdata) { - return default_discard_failure_cbk (frame, EPERM); + return default_discard_failure_cbk(frame, EPERM); } int -meta_default_zerofill (call_frame_t *frame, xlator_t *this, fd_t *fd, - off_t offset, off_t len, dict_t *xdata) +meta_default_zerofill(call_frame_t *frame, xlator_t *this, fd_t *fd, + off_t offset, off_t len, dict_t *xdata) { - return default_zerofill_failure_cbk (frame, EPERM); + return default_zerofill_failure_cbk(frame, EPERM); } -#define SET_META_DEFAULT_FOP(f,name) do { if (!f->name) f->name = meta_default_##name ; } while (0) +#define SET_META_DEFAULT_FOP(f, name) \ + do { \ + if (!f->name) \ + f->name = meta_default_##name; \ + } while (0) struct xlator_fops * -meta_defaults_init (struct xlator_fops *fops) -{ - SET_META_DEFAULT_FOP (fops,create); - SET_META_DEFAULT_FOP (fops,open); - SET_META_DEFAULT_FOP (fops,stat); - SET_META_DEFAULT_FOP (fops,readlink); - SET_META_DEFAULT_FOP (fops,mknod); - SET_META_DEFAULT_FOP (fops,mkdir); - SET_META_DEFAULT_FOP (fops,unlink); - SET_META_DEFAULT_FOP (fops,rmdir); - SET_META_DEFAULT_FOP (fops,symlink); - SET_META_DEFAULT_FOP (fops,rename); - SET_META_DEFAULT_FOP (fops,link); - SET_META_DEFAULT_FOP (fops,truncate); - SET_META_DEFAULT_FOP (fops,readv); - SET_META_DEFAULT_FOP (fops,writev); - SET_META_DEFAULT_FOP (fops,statfs); - SET_META_DEFAULT_FOP (fops,flush); - SET_META_DEFAULT_FOP (fops,fsync); - SET_META_DEFAULT_FOP (fops,setxattr); - SET_META_DEFAULT_FOP (fops,getxattr); - SET_META_DEFAULT_FOP (fops,fsetxattr); - SET_META_DEFAULT_FOP (fops,fgetxattr); - SET_META_DEFAULT_FOP (fops,removexattr); - SET_META_DEFAULT_FOP (fops,fremovexattr); - SET_META_DEFAULT_FOP (fops,opendir); - SET_META_DEFAULT_FOP (fops,readdir); - SET_META_DEFAULT_FOP (fops,readdirp); - SET_META_DEFAULT_FOP (fops,fsyncdir); - SET_META_DEFAULT_FOP (fops,access); - SET_META_DEFAULT_FOP (fops,ftruncate); - SET_META_DEFAULT_FOP (fops,fstat); - SET_META_DEFAULT_FOP (fops,lk); - SET_META_DEFAULT_FOP (fops,inodelk); - SET_META_DEFAULT_FOP (fops,finodelk); - SET_META_DEFAULT_FOP (fops,entrylk); - SET_META_DEFAULT_FOP (fops,fentrylk); - SET_META_DEFAULT_FOP (fops,lookup); - SET_META_DEFAULT_FOP (fops,rchecksum); - SET_META_DEFAULT_FOP (fops,xattrop); - SET_META_DEFAULT_FOP (fops,fxattrop); - SET_META_DEFAULT_FOP (fops,setattr); - SET_META_DEFAULT_FOP (fops,fsetattr); - SET_META_DEFAULT_FOP (fops,fallocate); - SET_META_DEFAULT_FOP (fops,discard); - SET_META_DEFAULT_FOP (fops,zerofill); - - return fops; +meta_defaults_init(struct xlator_fops *fops) +{ + SET_META_DEFAULT_FOP(fops, create); + SET_META_DEFAULT_FOP(fops, open); + SET_META_DEFAULT_FOP(fops, stat); + SET_META_DEFAULT_FOP(fops, readlink); + SET_META_DEFAULT_FOP(fops, mknod); + SET_META_DEFAULT_FOP(fops, mkdir); + SET_META_DEFAULT_FOP(fops, unlink); + SET_META_DEFAULT_FOP(fops, rmdir); + SET_META_DEFAULT_FOP(fops, symlink); + SET_META_DEFAULT_FOP(fops, rename); + SET_META_DEFAULT_FOP(fops, link); + SET_META_DEFAULT_FOP(fops, truncate); + SET_META_DEFAULT_FOP(fops, readv); + SET_META_DEFAULT_FOP(fops, writev); + SET_META_DEFAULT_FOP(fops, statfs); + SET_META_DEFAULT_FOP(fops, flush); + SET_META_DEFAULT_FOP(fops, fsync); + SET_META_DEFAULT_FOP(fops, setxattr); + SET_META_DEFAULT_FOP(fops, getxattr); + SET_META_DEFAULT_FOP(fops, fsetxattr); + SET_META_DEFAULT_FOP(fops, fgetxattr); + SET_META_DEFAULT_FOP(fops, removexattr); + SET_META_DEFAULT_FOP(fops, fremovexattr); + SET_META_DEFAULT_FOP(fops, opendir); + SET_META_DEFAULT_FOP(fops, readdir); + SET_META_DEFAULT_FOP(fops, readdirp); + SET_META_DEFAULT_FOP(fops, fsyncdir); + SET_META_DEFAULT_FOP(fops, access); + SET_META_DEFAULT_FOP(fops, ftruncate); + SET_META_DEFAULT_FOP(fops, fstat); + SET_META_DEFAULT_FOP(fops, lk); + SET_META_DEFAULT_FOP(fops, inodelk); + SET_META_DEFAULT_FOP(fops, finodelk); + SET_META_DEFAULT_FOP(fops, entrylk); + SET_META_DEFAULT_FOP(fops, fentrylk); + SET_META_DEFAULT_FOP(fops, lookup); + SET_META_DEFAULT_FOP(fops, rchecksum); + SET_META_DEFAULT_FOP(fops, xattrop); + SET_META_DEFAULT_FOP(fops, fxattrop); + SET_META_DEFAULT_FOP(fops, setattr); + SET_META_DEFAULT_FOP(fops, fsetattr); + SET_META_DEFAULT_FOP(fops, fallocate); + SET_META_DEFAULT_FOP(fops, discard); + SET_META_DEFAULT_FOP(fops, zerofill); + + return fops; } diff --git a/xlators/meta/src/meta-helpers.c b/xlators/meta/src/meta-helpers.c index bffbe737ebb..08a3016f640 100644 --- a/xlators/meta/src/meta-helpers.c +++ b/xlators/meta/src/meta-helpers.c @@ -14,337 +14,318 @@ #include "meta-mem-types.h" #include "meta.h" - meta_fd_t * -meta_fd_get (fd_t *fd, xlator_t *this) +meta_fd_get(fd_t *fd, xlator_t *this) { - uint64_t value = 0; - meta_fd_t *meta_fd = NULL; - - LOCK (&fd->lock); - { - if (__fd_ctx_get (fd, this, &value) < 0) { - if (!value) { - meta_fd = GF_CALLOC (1, sizeof (*meta_fd), - gf_meta_mt_fd_t); - if (!meta_fd) - goto unlock; - value = (long) meta_fd; - __fd_ctx_set (fd, this, value); - } - } else { - meta_fd = (void *)value; - } - } + uint64_t value = 0; + meta_fd_t *meta_fd = NULL; + + LOCK(&fd->lock); + { + if (__fd_ctx_get(fd, this, &value) < 0) { + if (!value) { + meta_fd = GF_CALLOC(1, sizeof(*meta_fd), gf_meta_mt_fd_t); + if (!meta_fd) + goto unlock; + value = (long)meta_fd; + __fd_ctx_set(fd, this, value); + } + } else { + meta_fd = (void *)value; + } + } unlock: - UNLOCK (&fd->lock); + UNLOCK(&fd->lock); - return meta_fd; + return meta_fd; } - int -meta_fd_release (fd_t *fd, xlator_t *this) +meta_fd_release(fd_t *fd, xlator_t *this) { - uint64_t value = 0; - meta_fd_t *meta_fd = NULL; - int i = 0; - - fd_ctx_get (fd, this, &value); - meta_fd = (void *) value; - - if (meta_fd && meta_fd->dirents) { - for (i = 0; i < meta_fd->size; i++) - GF_FREE ((void *)meta_fd->dirents[i].name); - GF_FREE (meta_fd->dirents); - } - - if (meta_fd) { - GF_FREE (meta_fd->data); - GF_FREE (meta_fd); - } - return 0; + uint64_t value = 0; + meta_fd_t *meta_fd = NULL; + int i = 0; + + fd_ctx_get(fd, this, &value); + meta_fd = (void *)value; + + if (meta_fd && meta_fd->dirents) { + for (i = 0; i < meta_fd->size; i++) + GF_FREE((void *)meta_fd->dirents[i].name); + GF_FREE(meta_fd->dirents); + } + + if (meta_fd) { + GF_FREE(meta_fd->data); + GF_FREE(meta_fd); + } + return 0; } - struct meta_ops * -meta_ops_get (inode_t *inode, xlator_t *this) +meta_ops_get(inode_t *inode, xlator_t *this) { - struct meta_ops *ops = NULL; - uint64_t value = 0; + struct meta_ops *ops = NULL; + uint64_t value = 0; - inode_ctx_get2 (inode, this, NULL, &value); + inode_ctx_get2(inode, this, NULL, &value); - ops = (void *) value; + ops = (void *)value; - return ops; + return ops; } - struct xlator_fops * -meta_fops_get (inode_t *inode, xlator_t *this) +meta_fops_get(inode_t *inode, xlator_t *this) { - struct meta_ops *ops = NULL; + struct meta_ops *ops = NULL; - ops = meta_ops_get (inode, this); - if (!ops) - return default_fops; + ops = meta_ops_get(inode, this); + if (!ops) + return default_fops; - return &ops->fops; + return &ops->fops; } - int -meta_ops_set (inode_t *inode, xlator_t *this, struct meta_ops *ops) +meta_ops_set(inode_t *inode, xlator_t *this, struct meta_ops *ops) { - uint64_t value = 0; - int ret = 0; + uint64_t value = 0; + int ret = 0; - meta_defaults_init (&ops->fops); + meta_defaults_init(&ops->fops); - value = (long) ops; + value = (long)ops; - ret = inode_ctx_set2 (inode, this, NULL, &value); + ret = inode_ctx_set2(inode, this, NULL, &value); - return ret; + return ret; } void * -meta_ctx_get (inode_t *inode, xlator_t *this) +meta_ctx_get(inode_t *inode, xlator_t *this) { - void *ctx = NULL; - uint64_t value = 0; + void *ctx = NULL; + uint64_t value = 0; - inode_ctx_get2 (inode, this, &value, 0); + inode_ctx_get2(inode, this, &value, 0); - ctx = (void *) value; + ctx = (void *)value; - return ctx; + return ctx; } - int -meta_ctx_set (inode_t *inode, xlator_t *this, void *ctx) +meta_ctx_set(inode_t *inode, xlator_t *this, void *ctx) { - uint64_t value = 0; - int ret = 0; + uint64_t value = 0; + int ret = 0; - value = (long) ctx; + value = (long)ctx; - ret = inode_ctx_set2 (inode, this, &value, 0); + ret = inode_ctx_set2(inode, this, &value, 0); - return ret; + return ret; } - void -meta_local_cleanup (meta_local_t *local, xlator_t *this) +meta_local_cleanup(meta_local_t *local, xlator_t *this) { - if (!local) - return; + if (!local) + return; - if (local->xdata) - dict_unref (local->xdata); + if (local->xdata) + dict_unref(local->xdata); - GF_FREE (local); - return; + GF_FREE(local); + return; } - meta_local_t * -meta_local (call_frame_t *frame) +meta_local(call_frame_t *frame) { - meta_local_t *local = NULL; + meta_local_t *local = NULL; - local = frame->local; - if (!local) - local = frame->local = GF_CALLOC (1, sizeof(*local), - gf_meta_mt_local_t); - return local; + local = frame->local; + if (!local) + local = frame->local = GF_CALLOC(1, sizeof(*local), gf_meta_mt_local_t); + return local; } - dict_t * -meta_direct_io_mode (dict_t *xdata, call_frame_t *frame) +meta_direct_io_mode(dict_t *xdata, call_frame_t *frame) { - meta_local_t *local = NULL; + meta_local_t *local = NULL; - if (!xdata) { - local = meta_local (frame); - if (!local) - return NULL; - xdata = local->xdata = dict_new(); - if (!xdata) - return NULL; - } + if (!xdata) { + local = meta_local(frame); + if (!local) + return NULL; + xdata = local->xdata = dict_new(); + if (!xdata) + return NULL; + } - if (dict_set_int8 (xdata, "direct-io-mode", 1) != 0) - return NULL; + if (dict_set_int8(xdata, "direct-io-mode", 1) != 0) + return NULL; - return xdata; + return xdata; } - static void -meta_uuid_copy (uuid_t dst, uuid_t src) +meta_uuid_copy(uuid_t dst, uuid_t src) { - gf_uuid_copy (dst, src); - if (gf_uuid_is_null (dst)) - gf_uuid_generate (dst); + gf_uuid_copy(dst, src); + if (gf_uuid_is_null(dst)) + gf_uuid_generate(dst); } - static void -default_meta_iatt_fill (struct iatt *iatt, inode_t *inode, ia_type_t type) +default_meta_iatt_fill(struct iatt *iatt, inode_t *inode, ia_type_t type) { - struct timeval tv = { }; - - iatt->ia_type = type; - switch (type) - { - case IA_IFDIR: - iatt->ia_prot = ia_prot_from_st_mode (0755); - iatt->ia_nlink = 2; - break; - case IA_IFLNK: - iatt->ia_prot = ia_prot_from_st_mode (0777); - iatt->ia_nlink = 1; - break; - default: - iatt->ia_prot = ia_prot_from_st_mode (0644); - iatt->ia_nlink = 1; - break; - } - iatt->ia_uid = 0; - iatt->ia_gid = 0; - iatt->ia_size = 0; - - meta_uuid_copy (iatt->ia_gfid, inode->gfid); - iatt->ia_ino = gfid_to_ino (iatt->ia_gfid); - - gettimeofday (&tv, 0); - iatt->ia_mtime = iatt->ia_ctime = iatt->ia_atime = tv.tv_sec; - iatt->ia_mtime_nsec = iatt->ia_ctime_nsec = iatt->ia_atime_nsec = - (tv.tv_usec * 1000); - return; + struct timeval tv = {}; + + iatt->ia_type = type; + switch (type) { + case IA_IFDIR: + iatt->ia_prot = ia_prot_from_st_mode(0755); + iatt->ia_nlink = 2; + break; + case IA_IFLNK: + iatt->ia_prot = ia_prot_from_st_mode(0777); + iatt->ia_nlink = 1; + break; + default: + iatt->ia_prot = ia_prot_from_st_mode(0644); + iatt->ia_nlink = 1; + break; + } + iatt->ia_uid = 0; + iatt->ia_gid = 0; + iatt->ia_size = 0; + + meta_uuid_copy(iatt->ia_gfid, inode->gfid); + iatt->ia_ino = gfid_to_ino(iatt->ia_gfid); + + gettimeofday(&tv, 0); + iatt->ia_mtime = iatt->ia_ctime = iatt->ia_atime = tv.tv_sec; + iatt->ia_mtime_nsec = iatt->ia_ctime_nsec = iatt->ia_atime_nsec = + (tv.tv_usec * 1000); + return; } - void -meta_iatt_fill (struct iatt *iatt, inode_t *inode, ia_type_t type) +meta_iatt_fill(struct iatt *iatt, inode_t *inode, ia_type_t type) { - struct meta_ops *ops = NULL; + struct meta_ops *ops = NULL; - ops = meta_ops_get (inode, THIS); - if (!ops) - return; + ops = meta_ops_get(inode, THIS); + if (!ops) + return; - if (!ops->iatt_fill) - default_meta_iatt_fill (iatt, inode, type); - else - ops->iatt_fill (THIS, inode, iatt); - return; + if (!ops->iatt_fill) + default_meta_iatt_fill(iatt, inode, type); + else + ops->iatt_fill(THIS, inode, iatt); + return; } - int -meta_inode_discover (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_inode_discover(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - struct iatt iatt = { }; - struct iatt postparent = { }; + struct iatt iatt = {}; + struct iatt postparent = {}; - meta_iatt_fill (&iatt, loc->inode, loc->inode->ia_type); + meta_iatt_fill(&iatt, loc->inode, loc->inode->ia_type); - META_STACK_UNWIND (lookup, frame, 0, 0, loc->inode, &iatt, xdata, - &postparent); - return 0; + META_STACK_UNWIND(lookup, frame, 0, 0, loc->inode, &iatt, xdata, + &postparent); + return 0; } - int -meta_file_fill (xlator_t *this, fd_t *fd) +meta_file_fill(xlator_t *this, fd_t *fd) { - meta_fd_t *meta_fd = NULL; - strfd_t *strfd = NULL; - struct meta_ops *ops = NULL; - int ret = 0; + meta_fd_t *meta_fd = NULL; + strfd_t *strfd = NULL; + struct meta_ops *ops = NULL; + int ret = 0; - meta_fd = meta_fd_get (fd, this); - if (!meta_fd) - return -1; + meta_fd = meta_fd_get(fd, this); + if (!meta_fd) + return -1; - if (meta_fd->data) - return meta_fd->size; + if (meta_fd->data) + return meta_fd->size; - strfd = strfd_open (); - if (!strfd) - return -1; + strfd = strfd_open(); + if (!strfd) + return -1; - ops = meta_ops_get (fd->inode, this); - if (!ops) { - strfd_close (strfd); - return -1; - } + ops = meta_ops_get(fd->inode, this); + if (!ops) { + strfd_close(strfd); + return -1; + } - if (ops->file_fill) - ret = ops->file_fill (this, fd->inode, strfd); + if (ops->file_fill) + ret = ops->file_fill(this, fd->inode, strfd); - if (ret >= 0) { - meta_fd->data = strfd->data; - meta_fd->size = strfd->size; + if (ret >= 0) { + meta_fd->data = strfd->data; + meta_fd->size = strfd->size; - strfd->data = NULL; - } + strfd->data = NULL; + } - strfd_close (strfd); + strfd_close(strfd); - return meta_fd->size; + return meta_fd->size; } - int -meta_dir_fill (xlator_t *this, fd_t *fd) +meta_dir_fill(xlator_t *this, fd_t *fd) { - meta_fd_t *meta_fd = NULL; - struct meta_ops *ops = NULL; - struct meta_dirent *dp = NULL; - int ret = 0; + meta_fd_t *meta_fd = NULL; + struct meta_ops *ops = NULL; + struct meta_dirent *dp = NULL; + int ret = 0; - meta_fd = meta_fd_get (fd, this); - if (!meta_fd) - return -1; + meta_fd = meta_fd_get(fd, this); + if (!meta_fd) + return -1; - if (meta_fd->dirents) - return meta_fd->size; + if (meta_fd->dirents) + return meta_fd->size; - ops = meta_ops_get (fd->inode, this); - if (!ops) - return -1; + ops = meta_ops_get(fd->inode, this); + if (!ops) + return -1; - if (ops->dir_fill) - ret = ops->dir_fill (this, fd->inode, &dp); + if (ops->dir_fill) + ret = ops->dir_fill(this, fd->inode, &dp); - if (dp) { - meta_fd->dirents = dp; - meta_fd->size = ret; - } + if (dp) { + meta_fd->dirents = dp; + meta_fd->size = ret; + } - return meta_fd->size; + return meta_fd->size; } - int -fixed_dirents_len (struct meta_dirent *dirents) +fixed_dirents_len(struct meta_dirent *dirents) { - int i = 0; - struct meta_dirent *dirent = NULL; + int i = 0; + struct meta_dirent *dirent = NULL; - if (!dirents) - return 0; + if (!dirents) + return 0; - for (dirent = dirents; dirent->name; dirent++) - i++; + for (dirent = dirents; dirent->name; dirent++) + i++; - return i; + return i; } diff --git a/xlators/meta/src/meta.c b/xlators/meta/src/meta.c index 4c4d671f59d..9294bbdae0c 100644 --- a/xlators/meta/src/meta.c +++ b/xlators/meta/src/meta.c @@ -16,274 +16,249 @@ #include "meta-hooks.h" - int -meta_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) +meta_lookup(call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) { - inode_t *inode = NULL; + inode_t *inode = NULL; - if (META_HOOK (loc) || IS_META_ROOT_GFID (loc->gfid)) { - struct iatt iatt = { }; - struct iatt parent = { }; + if (META_HOOK(loc) || IS_META_ROOT_GFID(loc->gfid)) { + struct iatt iatt = {}; + struct iatt parent = {}; - meta_root_dir_hook (frame, this, loc, xdata); + meta_root_dir_hook(frame, this, loc, xdata); - meta_iatt_fill (&iatt, loc->inode, IA_IFDIR); - gf_uuid_parse (META_ROOT_GFID, iatt.ia_gfid); + meta_iatt_fill(&iatt, loc->inode, IA_IFDIR); + gf_uuid_parse(META_ROOT_GFID, iatt.ia_gfid); - META_STACK_UNWIND (lookup, frame, 0, 0, loc->inode, &iatt, - xdata, &parent); - return 0; - } + META_STACK_UNWIND(lookup, frame, 0, 0, loc->inode, &iatt, xdata, + &parent); + return 0; + } - if (loc->parent) - inode = loc->parent; - else - inode = loc->inode; + if (loc->parent) + inode = loc->parent; + else + inode = loc->inode; - META_FOP (inode, lookup, frame, this, loc, xdata); + META_FOP(inode, lookup, frame, this, loc, xdata); - return 0; + return 0; } - int -meta_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, - dict_t *xdata) +meta_opendir(call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, + dict_t *xdata) { - META_FOP (fd->inode, opendir, frame, this, loc, fd, xdata); + META_FOP(fd->inode, opendir, frame, this, loc, fd, xdata); - return 0; + return 0; } - int -meta_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags, fd_t *fd, - dict_t *xdata) +meta_open(call_frame_t *frame, xlator_t *this, loc_t *loc, int flags, fd_t *fd, + dict_t *xdata) { - META_FOP (fd->inode, open, frame, this, loc, flags, fd, xdata); + META_FOP(fd->inode, open, frame, this, loc, flags, fd, xdata); - return 0; + return 0; } - int -meta_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - off_t offset, uint32_t flags, dict_t *xdata) +meta_readv(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, + off_t offset, uint32_t flags, dict_t *xdata) { - META_FOP (fd->inode, readv, frame, this, fd, size, offset, flags, xdata); + META_FOP(fd->inode, readv, frame, this, fd, size, offset, flags, xdata); - return 0; + return 0; } - int -meta_flush (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) +meta_flush(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) { - META_FOP (fd->inode, flush, frame, this, fd, xdata); + META_FOP(fd->inode, flush, frame, this, fd, xdata); - return 0; + return 0; } - int -meta_stat (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) +meta_stat(call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) { - META_FOP (loc->inode, stat, frame, this, loc, xdata); + META_FOP(loc->inode, stat, frame, this, loc, xdata); - return 0; + return 0; } - int -meta_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) +meta_fstat(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) { - META_FOP (fd->inode, fstat, frame, this, fd, xdata); + META_FOP(fd->inode, fstat, frame, this, fd, xdata); - return 0; + return 0; } - int -meta_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - off_t offset, dict_t *xdata) +meta_readdir(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, + off_t offset, dict_t *xdata) { - META_FOP (fd->inode, readdir, frame, this, fd, size, offset, xdata); + META_FOP(fd->inode, readdir, frame, this, fd, size, offset, xdata); - return 0; + return 0; } - int -meta_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - off_t offset, dict_t *xdata) +meta_readdirp(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, + off_t offset, dict_t *xdata) { - META_FOP (fd->inode, readdirp, frame, this, fd, size, offset, xdata); + META_FOP(fd->inode, readdirp, frame, this, fd, size, offset, xdata); - return 0; + return 0; } - int -meta_readlink (call_frame_t *frame, xlator_t *this, loc_t *loc, size_t size, - dict_t *xdata) +meta_readlink(call_frame_t *frame, xlator_t *this, loc_t *loc, size_t size, + dict_t *xdata) { - META_FOP (loc->inode, readlink, frame, this, loc, size, xdata); + META_FOP(loc->inode, readlink, frame, this, loc, size, xdata); - return 0; + return 0; } - int -meta_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *iov, - int count, off_t offset, uint32_t flags, struct iobref *iobref, - dict_t *xdata) +meta_writev(call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *iov, + int count, off_t offset, uint32_t flags, struct iobref *iobref, + dict_t *xdata) { - META_FOP (fd->inode, writev, frame, this, fd, iov, count, offset, flags, - iobref, xdata); - return 0; + META_FOP(fd->inode, writev, frame, this, fd, iov, count, offset, flags, + iobref, xdata); + return 0; } - int -meta_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset, - dict_t *xdata) +meta_truncate(call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset, + dict_t *xdata) { - META_FOP (loc->inode, truncate, frame, this, loc, offset, xdata); + META_FOP(loc->inode, truncate, frame, this, loc, offset, xdata); - return 0; + return 0; } - int -meta_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, - dict_t *xdata) +meta_ftruncate(call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, + dict_t *xdata) { - META_FOP (fd->inode, ftruncate, frame, this, fd, offset, xdata); + META_FOP(fd->inode, ftruncate, frame, this, fd, offset, xdata); - return 0; + return 0; } int32_t -meta_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, - dict_t *xdata) +meta_fsync(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, + dict_t *xdata) { - META_FOP (fd->inode, fsync, frame, this, fd, flags, xdata); + META_FOP(fd->inode, fsync, frame, this, fd, flags, xdata); - return 0; + return 0; } int32_t -meta_fsyncdir (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, - dict_t *xdata) +meta_fsyncdir(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, + dict_t *xdata) { - META_FOP (fd->inode, fsyncdir, frame, this, fd, flags, xdata); + META_FOP(fd->inode, fsyncdir, frame, this, fd, flags, xdata); - return 0; + return 0; } int -meta_forget (xlator_t *this, inode_t *inode) +meta_forget(xlator_t *this, inode_t *inode) { - return 0; + return 0; } - int -meta_release (xlator_t *this, fd_t *fd) +meta_release(xlator_t *this, fd_t *fd) { - return meta_fd_release (fd, this); + return meta_fd_release(fd, this); } - int -meta_releasedir (xlator_t *this, fd_t *fd) +meta_releasedir(xlator_t *this, fd_t *fd) { - return meta_fd_release (fd, this); + return meta_fd_release(fd, this); } - int -mem_acct_init (xlator_t *this) +mem_acct_init(xlator_t *this) { - int ret = -1; - - if (!this) - return ret; + int ret = -1; - ret = xlator_mem_acct_init (this, gf_meta_mt_end + 1); + if (!this) + return ret; - if (ret != 0) { - gf_log (this->name, GF_LOG_ERROR, - "Memory accounting init failed"); - return ret; - } + ret = xlator_mem_acct_init(this, gf_meta_mt_end + 1); + if (ret != 0) { + gf_log(this->name, GF_LOG_ERROR, "Memory accounting init failed"); return ret; -} + } + return ret; +} int -init (xlator_t *this) +init(xlator_t *this) { - meta_priv_t *priv = NULL; - int ret = -1; + meta_priv_t *priv = NULL; + int ret = -1; - priv = GF_CALLOC (sizeof(*priv), 1, gf_meta_mt_priv_t); - if (!priv) - return ret; + priv = GF_CALLOC(sizeof(*priv), 1, gf_meta_mt_priv_t); + if (!priv) + return ret; - GF_OPTION_INIT ("meta-dir-name", priv->meta_dir_name, str, out); + GF_OPTION_INIT("meta-dir-name", priv->meta_dir_name, str, out); - this->private = priv; - ret = 0; + this->private = priv; + ret = 0; out: - if (ret) - GF_FREE (priv); + if (ret) + GF_FREE(priv); - return ret; + return ret; } - int -fini (xlator_t *this) +fini(xlator_t *this) { - GF_FREE (this->private); - return 0; + GF_FREE(this->private); + return 0; } - -struct xlator_fops fops = { - .lookup = meta_lookup, - .opendir = meta_opendir, - .open = meta_open, - .readv = meta_readv, - .flush = meta_flush, - .stat = meta_stat, - .fstat = meta_fstat, - .readdir = meta_readdir, - .readdirp = meta_readdirp, - .readlink = meta_readlink, - .writev = meta_writev, - .truncate = meta_truncate, - .ftruncate = meta_ftruncate, - .fsync = meta_fsync, - .fsyncdir = meta_fsyncdir -}; - +struct xlator_fops fops = {.lookup = meta_lookup, + .opendir = meta_opendir, + .open = meta_open, + .readv = meta_readv, + .flush = meta_flush, + .stat = meta_stat, + .fstat = meta_fstat, + .readdir = meta_readdir, + .readdirp = meta_readdirp, + .readlink = meta_readlink, + .writev = meta_writev, + .truncate = meta_truncate, + .ftruncate = meta_ftruncate, + .fsync = meta_fsync, + .fsyncdir = meta_fsyncdir}; struct xlator_cbks cbks = { - .forget = meta_forget, - .release = meta_release, - .releasedir = meta_releasedir, + .forget = meta_forget, + .release = meta_release, + .releasedir = meta_releasedir, }; - struct volume_options options[] = { - { .key = {"meta-dir-name"}, - .type = GF_OPTION_TYPE_STR, - .default_value = DEFAULT_META_DIR_NAME, - .description = "Name of default meta directory." - }, - { .key = {NULL} }, + {.key = {"meta-dir-name"}, + .type = GF_OPTION_TYPE_STR, + .default_value = DEFAULT_META_DIR_NAME, + .description = "Name of default meta directory."}, + {.key = {NULL}}, }; diff --git a/xlators/meta/src/name-file.c b/xlators/meta/src/name-file.c index faadbff7341..edba7142a69 100644 --- a/xlators/meta/src/name-file.c +++ b/xlators/meta/src/name-file.c @@ -16,32 +16,29 @@ #include "strfd.h" #include "lkowner.h" - static int -name_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +name_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - xlator_t *xl = NULL; + xlator_t *xl = NULL; - xl = meta_ctx_get (file, this); + xl = meta_ctx_get(file, this); - strprintf (strfd, "%s\n", xl->name); + strprintf(strfd, "%s\n", xl->name); - return strfd->size; + return strfd->size; } - static struct meta_ops name_file_ops = { - .file_fill = name_file_fill, + .file_fill = name_file_fill, }; - int -meta_name_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_name_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &name_file_ops); + meta_ops_set(loc->inode, this, &name_file_ops); - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - return 0; + return 0; } diff --git a/xlators/meta/src/option-file.c b/xlators/meta/src/option-file.c index 5a8465c5d8b..132b28fa86a 100644 --- a/xlators/meta/src/option-file.c +++ b/xlators/meta/src/option-file.c @@ -15,37 +15,31 @@ #include "meta.h" #include "meta-hooks.h" - static int -option_file_fill (xlator_t *this, inode_t *inode, strfd_t *strfd) +option_file_fill(xlator_t *this, inode_t *inode, strfd_t *strfd) { - data_t *data = NULL; + data_t *data = NULL; - data = meta_ctx_get (inode, this); + data = meta_ctx_get(inode, this); - strprintf (strfd, "%s\n", data_to_str (data)); + strprintf(strfd, "%s\n", data_to_str(data)); - return strfd->size; + return strfd->size; } - -static struct meta_ops option_file_ops = { - .file_fill = option_file_fill -}; - +static struct meta_ops option_file_ops = {.file_fill = option_file_fill}; int -meta_option_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_option_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - xlator_t *xl = NULL; + xlator_t *xl = NULL; - xl = meta_ctx_get (loc->parent, this); + xl = meta_ctx_get(loc->parent, this); - meta_ctx_set (loc->inode, this, - dict_get (xl->options, (char *) loc->name)); + meta_ctx_set(loc->inode, this, dict_get(xl->options, (char *)loc->name)); - meta_ops_set (loc->inode, this, &option_file_ops); + meta_ops_set(loc->inode, this, &option_file_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/options-dir.c b/xlators/meta/src/options-dir.c index e637afb1f73..bf2d07a3701 100644 --- a/xlators/meta/src/options-dir.c +++ b/xlators/meta/src/options-dir.c @@ -15,57 +15,51 @@ #include "meta.h" #include "meta-hooks.h" - static int -dict_key_add (dict_t *dict, char *key, data_t *value, void *data) +dict_key_add(dict_t *dict, char *key, data_t *value, void *data) { - struct meta_dirent **direntp = data; + struct meta_dirent **direntp = data; - (*direntp)->name = gf_strdup (key); - (*direntp)->type = IA_IFREG; - (*direntp)->hook = meta_option_file_hook; + (*direntp)->name = gf_strdup(key); + (*direntp)->type = IA_IFREG; + (*direntp)->hook = meta_option_file_hook; - (*direntp)++; - return 0; + (*direntp)++; + return 0; } - static int -options_dir_fill (xlator_t *this, inode_t *inode, struct meta_dirent **dp) +options_dir_fill(xlator_t *this, inode_t *inode, struct meta_dirent **dp) { - struct meta_dirent *dirent = NULL; - struct meta_dirent *direntp = NULL; - xlator_t *xl = NULL; + struct meta_dirent *dirent = NULL; + struct meta_dirent *direntp = NULL; + xlator_t *xl = NULL; - xl = meta_ctx_get (inode, this); + xl = meta_ctx_get(inode, this); - dirent = GF_CALLOC (sizeof (*dirent), xl->options->count, - gf_meta_mt_dirents_t); - if (!dirent) - return -1; + dirent = GF_CALLOC(sizeof(*dirent), xl->options->count, + gf_meta_mt_dirents_t); + if (!dirent) + return -1; - direntp = dirent; + direntp = dirent; - dict_foreach (xl->options, dict_key_add, &direntp); + dict_foreach(xl->options, dict_key_add, &direntp); - *dp = dirent; + *dp = dirent; - return xl->options->count; + return xl->options->count; } - -static struct meta_ops options_dir_ops = { - .dir_fill = options_dir_fill -}; - +static struct meta_ops options_dir_ops = {.dir_fill = options_dir_fill}; int -meta_options_dir_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_options_dir_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - meta_ops_set (loc->inode, this, &options_dir_ops); + meta_ops_set(loc->inode, this, &options_dir_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/private-file.c b/xlators/meta/src/private-file.c index 8d12b467d75..068c8ebf191 100644 --- a/xlators/meta/src/private-file.c +++ b/xlators/meta/src/private-file.c @@ -16,32 +16,29 @@ #include "strfd.h" #include "statedump.h" - static int -private_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +private_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - xlator_t *xl = NULL; + xlator_t *xl = NULL; - xl = meta_ctx_get (file, this); + xl = meta_ctx_get(file, this); - gf_proc_dump_xlator_private (xl, strfd); + gf_proc_dump_xlator_private(xl, strfd); - return strfd->size; + return strfd->size; } - static struct meta_ops private_file_ops = { - .file_fill = private_file_fill, + .file_fill = private_file_fill, }; - int -meta_private_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_private_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &private_file_ops); + meta_ops_set(loc->inode, this, &private_file_ops); - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - return 0; + return 0; } diff --git a/xlators/meta/src/process_uuid-file.c b/xlators/meta/src/process_uuid-file.c index 37eb03ac5c3..bbf2e19f86e 100644 --- a/xlators/meta/src/process_uuid-file.c +++ b/xlators/meta/src/process_uuid-file.c @@ -16,25 +16,22 @@ #include "strfd.h" #include "lkowner.h" - static int -process_uuid_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +process_uuid_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - strprintf (strfd, "%s\n", this->ctx->process_uuid); - return strfd->size; + strprintf(strfd, "%s\n", this->ctx->process_uuid); + return strfd->size; } - static struct meta_ops process_uuid_file_ops = { - .file_fill = process_uuid_file_fill, + .file_fill = process_uuid_file_fill, }; - int -meta_process_uuid_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_process_uuid_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &process_uuid_file_ops); + meta_ops_set(loc->inode, this, &process_uuid_file_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/profile-file.c b/xlators/meta/src/profile-file.c index 7a8d0bf810e..9eb5c050dbe 100644 --- a/xlators/meta/src/profile-file.c +++ b/xlators/meta/src/profile-file.c @@ -16,32 +16,29 @@ #include "strfd.h" #include "statedump.h" - static int -profile_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +profile_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - xlator_t *xl = NULL; + xlator_t *xl = NULL; - xl = meta_ctx_get (file, this); + xl = meta_ctx_get(file, this); - gf_proc_dump_xlator_profile (xl, strfd); + gf_proc_dump_xlator_profile(xl, strfd); - return strfd->size; + return strfd->size; } - static struct meta_ops profile_file_ops = { - .file_fill = profile_file_fill, + .file_fill = profile_file_fill, }; - int -meta_profile_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_profile_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &profile_file_ops); + meta_ops_set(loc->inode, this, &profile_file_ops); - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - return 0; + return 0; } diff --git a/xlators/meta/src/root-dir.c b/xlators/meta/src/root-dir.c index b57313fd9ad..18d4fd6b8ec 100644 --- a/xlators/meta/src/root-dir.c +++ b/xlators/meta/src/root-dir.c @@ -15,60 +15,63 @@ #include "meta.h" #include "meta-hooks.h" - static struct meta_dirent root_dir_dirents[] = { - DOT_DOTDOT, - - { .name = "graphs", - .type = IA_IFDIR, - .hook = meta_graphs_dir_hook, - }, - { .name = "frames", - .type = IA_IFREG, - .hook = meta_frames_file_hook, - }, - { .name = "logging", - .type = IA_IFDIR, - .hook = meta_logging_dir_hook, - }, - { .name = "process_uuid", - .type = IA_IFREG, - .hook = meta_process_uuid_file_hook, - }, - { .name = "version", - .type = IA_IFREG, - .hook = meta_version_file_hook, - }, - { .name = "cmdline", - .type = IA_IFREG, - .hook = meta_cmdline_file_hook, - }, - { .name = "mallinfo", - .type = IA_IFREG, - .hook = meta_mallinfo_file_hook, - }, - { .name = "master", - .type = IA_IFDIR, - .hook = meta_master_dir_hook, - }, - { .name = "measure_latency", - .type = IA_IFREG, - .hook = meta_measure_file_hook, - }, - { .name = NULL } -}; - + DOT_DOTDOT, -static struct meta_ops meta_root_dir_ops = { - .fixed_dirents = root_dir_dirents -}; + { + .name = "graphs", + .type = IA_IFDIR, + .hook = meta_graphs_dir_hook, + }, + { + .name = "frames", + .type = IA_IFREG, + .hook = meta_frames_file_hook, + }, + { + .name = "logging", + .type = IA_IFDIR, + .hook = meta_logging_dir_hook, + }, + { + .name = "process_uuid", + .type = IA_IFREG, + .hook = meta_process_uuid_file_hook, + }, + { + .name = "version", + .type = IA_IFREG, + .hook = meta_version_file_hook, + }, + { + .name = "cmdline", + .type = IA_IFREG, + .hook = meta_cmdline_file_hook, + }, + { + .name = "mallinfo", + .type = IA_IFREG, + .hook = meta_mallinfo_file_hook, + }, + { + .name = "master", + .type = IA_IFDIR, + .hook = meta_master_dir_hook, + }, + { + .name = "measure_latency", + .type = IA_IFREG, + .hook = meta_measure_file_hook, + }, + {.name = NULL}}; +static struct meta_ops meta_root_dir_ops = {.fixed_dirents = root_dir_dirents}; int -meta_root_dir_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_root_dir_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &meta_root_dir_ops); + meta_ops_set(loc->inode, this, &meta_root_dir_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/subvolume-link.c b/xlators/meta/src/subvolume-link.c index 018d42a53a1..45d909daca2 100644 --- a/xlators/meta/src/subvolume-link.c +++ b/xlators/meta/src/subvolume-link.c @@ -14,48 +14,43 @@ #include "meta-mem-types.h" #include "meta.h" - static int -subvolume_link_fill (xlator_t *this, inode_t *inode, strfd_t *strfd) +subvolume_link_fill(xlator_t *this, inode_t *inode, strfd_t *strfd) { - xlator_t *xl = NULL; + xlator_t *xl = NULL; - xl = meta_ctx_get (inode, this); + xl = meta_ctx_get(inode, this); - strprintf (strfd, "../../%s", xl->name); + strprintf(strfd, "../../%s", xl->name); - return 0; + return 0; } - -struct meta_ops subvolume_link_ops = { - .link_fill = subvolume_link_fill -}; - +struct meta_ops subvolume_link_ops = {.link_fill = subvolume_link_fill}; int -meta_subvolume_link_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_subvolume_link_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - int count = 0; - int i = 0; - xlator_t *xl = NULL; - xlator_list_t *subv = NULL; - xlator_t *subvol = NULL; - - count = strtol (loc->name, 0, 0); - xl = meta_ctx_get (loc->parent, this); - - for (subv = xl->children; subv; subv = subv->next) { - if (i == count) { - subvol = subv->xlator; - break; - } - i++; - } - - meta_ctx_set (loc->inode, this, subvol); - - meta_ops_set (loc->inode, this, &subvolume_link_ops); - return 0; + int count = 0; + int i = 0; + xlator_t *xl = NULL; + xlator_list_t *subv = NULL; + xlator_t *subvol = NULL; + + count = strtol(loc->name, 0, 0); + xl = meta_ctx_get(loc->parent, this); + + for (subv = xl->children; subv; subv = subv->next) { + if (i == count) { + subvol = subv->xlator; + break; + } + i++; + } + + meta_ctx_set(loc->inode, this, subvol); + + meta_ops_set(loc->inode, this, &subvolume_link_ops); + return 0; } diff --git a/xlators/meta/src/subvolumes-dir.c b/xlators/meta/src/subvolumes-dir.c index 59db75e260f..e9582c53cf7 100644 --- a/xlators/meta/src/subvolumes-dir.c +++ b/xlators/meta/src/subvolumes-dir.c @@ -15,53 +15,48 @@ #include "meta.h" #include "meta-hooks.h" - static int -subvolumes_dir_fill (xlator_t *this, inode_t *dir, struct meta_dirent **dp) +subvolumes_dir_fill(xlator_t *this, inode_t *dir, struct meta_dirent **dp) { - struct meta_dirent *dirents = NULL; - xlator_t *xl = NULL; - xlator_list_t *subv = NULL; - int i = 0; - int count = 0; + struct meta_dirent *dirents = NULL; + xlator_t *xl = NULL; + xlator_list_t *subv = NULL; + int i = 0; + int count = 0; - xl = meta_ctx_get (dir, this); + xl = meta_ctx_get(dir, this); - for (subv = xl->children; subv; subv = subv->next) - count++; + for (subv = xl->children; subv; subv = subv->next) + count++; - dirents = GF_MALLOC (sizeof (*dirents) * count, gf_meta_mt_dirents_t); - if (!dirents) - return -1; + dirents = GF_MALLOC(sizeof(*dirents) * count, gf_meta_mt_dirents_t); + if (!dirents) + return -1; - for (subv = xl->children; subv; subv = subv->next) { - char num[16] = { }; - snprintf (num, 16, "%d", i); + for (subv = xl->children; subv; subv = subv->next) { + char num[16] = {}; + snprintf(num, 16, "%d", i); - dirents[i].name = gf_strdup (num); - dirents[i].type = IA_IFLNK; - dirents[i].hook = meta_subvolume_link_hook; - i++; - } + dirents[i].name = gf_strdup(num); + dirents[i].type = IA_IFLNK; + dirents[i].hook = meta_subvolume_link_hook; + i++; + } - *dp = dirents; + *dp = dirents; - return count; + return count; } - -static struct meta_ops subvolumes_dir_ops = { - .dir_fill = subvolumes_dir_fill -}; - +static struct meta_ops subvolumes_dir_ops = {.dir_fill = subvolumes_dir_fill}; int -meta_subvolumes_dir_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_subvolumes_dir_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - meta_ops_set (loc->inode, this, &subvolumes_dir_ops); + meta_ops_set(loc->inode, this, &subvolumes_dir_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/top-link.c b/xlators/meta/src/top-link.c index 97cec0a2b62..bfee742a1be 100644 --- a/xlators/meta/src/top-link.c +++ b/xlators/meta/src/top-link.c @@ -14,32 +14,27 @@ #include "meta-mem-types.h" #include "meta.h" - static int -top_link_fill (xlator_t *this, inode_t *inode, strfd_t *strfd) +top_link_fill(xlator_t *this, inode_t *inode, strfd_t *strfd) { - glusterfs_graph_t *graph = NULL; + glusterfs_graph_t *graph = NULL; - graph = meta_ctx_get (inode, this); + graph = meta_ctx_get(inode, this); - strprintf (strfd, "%s", ((xlator_t *)graph->top)->name); + strprintf(strfd, "%s", ((xlator_t *)graph->top)->name); - return 0; + return 0; } - -struct meta_ops top_link_ops = { - .link_fill = top_link_fill -}; - +struct meta_ops top_link_ops = {.link_fill = top_link_fill}; int -meta_top_link_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_top_link_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &top_link_ops); + meta_ops_set(loc->inode, this, &top_link_ops); - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - return 0; + return 0; } diff --git a/xlators/meta/src/type-file.c b/xlators/meta/src/type-file.c index 235ecc2dd6d..00141275957 100644 --- a/xlators/meta/src/type-file.c +++ b/xlators/meta/src/type-file.c @@ -16,32 +16,29 @@ #include "strfd.h" #include "lkowner.h" - static int -type_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +type_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - xlator_t *xl = NULL; + xlator_t *xl = NULL; - xl = meta_ctx_get (file, this); + xl = meta_ctx_get(file, this); - strprintf (strfd, "%s\n", xl->type); + strprintf(strfd, "%s\n", xl->type); - return strfd->size; + return strfd->size; } - static struct meta_ops type_file_ops = { - .file_fill = type_file_fill, + .file_fill = type_file_fill, }; - int -meta_type_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_type_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &type_file_ops); + meta_ops_set(loc->inode, this, &type_file_ops); - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - return 0; + return 0; } diff --git a/xlators/meta/src/version-file.c b/xlators/meta/src/version-file.c index 1b0e4458448..7331684238c 100644 --- a/xlators/meta/src/version-file.c +++ b/xlators/meta/src/version-file.c @@ -16,26 +16,22 @@ #include "strfd.h" #include "lkowner.h" - static int -version_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +version_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - strprintf (strfd, "{ \n \"Package Version\": \"%s\"\n}", - PACKAGE_VERSION); - return strfd->size; + strprintf(strfd, "{ \n \"Package Version\": \"%s\"\n}", PACKAGE_VERSION); + return strfd->size; } - static struct meta_ops version_file_ops = { - .file_fill = version_file_fill, + .file_fill = version_file_fill, }; - int -meta_version_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_version_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &version_file_ops); + meta_ops_set(loc->inode, this, &version_file_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/view-dir.c b/xlators/meta/src/view-dir.c index dc208cb5b65..313bf6d7124 100644 --- a/xlators/meta/src/view-dir.c +++ b/xlators/meta/src/view-dir.c @@ -15,26 +15,19 @@ #include "meta.h" #include "meta-hooks.h" +static struct meta_dirent view_dir_dirents[] = {DOT_DOTDOT, -static struct meta_dirent view_dir_dirents[] = { - DOT_DOTDOT, - - { .name = NULL } -}; - - -static struct meta_ops view_dir_ops = { - .fixed_dirents = view_dir_dirents -}; + {.name = NULL}}; +static struct meta_ops view_dir_ops = {.fixed_dirents = view_dir_dirents}; int -meta_view_dir_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_view_dir_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - meta_ops_set (loc->inode, this, &view_dir_ops); + meta_ops_set(loc->inode, this, &view_dir_ops); - return 0; + return 0; } diff --git a/xlators/meta/src/volfile-file.c b/xlators/meta/src/volfile-file.c index c6027658fee..5242a14bb8c 100644 --- a/xlators/meta/src/volfile-file.c +++ b/xlators/meta/src/volfile-file.c @@ -15,72 +15,65 @@ #include "meta.h" #include "strfd.h" - - static int -xldump_options (dict_t *this, char *key, data_t *value, void *strfd) +xldump_options(dict_t *this, char *key, data_t *value, void *strfd) { - strprintf (strfd, " option %s %s\n", key, value->data); - return 0; + strprintf(strfd, " option %s %s\n", key, value->data); + return 0; } - static void -xldump_subvolumes (xlator_t *this, void *strfd) +xldump_subvolumes(xlator_t *this, void *strfd) { - xlator_list_t *subv = NULL; + xlator_list_t *subv = NULL; - if (!this->children) - return; + if (!this->children) + return; - strprintf (strfd, " subvolumes"); + strprintf(strfd, " subvolumes"); - for (subv = this->children; subv; subv= subv->next) - strprintf (strfd, " %s", subv->xlator->name); + for (subv = this->children; subv; subv = subv->next) + strprintf(strfd, " %s", subv->xlator->name); - strprintf (strfd, "\n"); + strprintf(strfd, "\n"); } - static void -xldump (xlator_t *each, void *strfd) +xldump(xlator_t *each, void *strfd) { - strprintf (strfd, "volume %s\n", each->name); - strprintf (strfd, " type %s\n", each->type); - dict_foreach (each->options, xldump_options, strfd); + strprintf(strfd, "volume %s\n", each->name); + strprintf(strfd, " type %s\n", each->type); + dict_foreach(each->options, xldump_options, strfd); - xldump_subvolumes (each, strfd); + xldump_subvolumes(each, strfd); - strprintf (strfd, "end-volume\n"); - strprintf (strfd, "\n"); + strprintf(strfd, "end-volume\n"); + strprintf(strfd, "\n"); } - static int -volfile_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd) +volfile_file_fill(xlator_t *this, inode_t *file, strfd_t *strfd) { - glusterfs_graph_t *graph = NULL; + glusterfs_graph_t *graph = NULL; - graph = meta_ctx_get (file, this); + graph = meta_ctx_get(file, this); - xlator_foreach_depth_first (graph->top, xldump, strfd); + xlator_foreach_depth_first(graph->top, xldump, strfd); - return strfd->size; + return strfd->size; } - static struct meta_ops volfile_file_ops = { - .file_fill = volfile_file_fill, + .file_fill = volfile_file_fill, }; - int -meta_volfile_file_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_volfile_file_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ops_set (loc->inode, this, &volfile_file_ops); + meta_ops_set(loc->inode, this, &volfile_file_ops); - meta_ctx_set (loc->inode, this, meta_ctx_get (loc->parent, this)); + meta_ctx_set(loc->inode, this, meta_ctx_get(loc->parent, this)); - return 0; + return 0; } diff --git a/xlators/meta/src/xlator-dir.c b/xlators/meta/src/xlator-dir.c index 910e82b3871..1715cbb56a0 100644 --- a/xlators/meta/src/xlator-dir.c +++ b/xlators/meta/src/xlator-dir.c @@ -15,81 +15,83 @@ #include "meta.h" #include "meta-hooks.h" - static struct meta_dirent xlator_dir_dirents[] = { - DOT_DOTDOT, - - { .name = "view", - .type = IA_IFDIR, - .hook = meta_view_dir_hook, - }, - { .name = "type", - .type = IA_IFREG, - .hook = meta_type_file_hook, - }, - { .name = "name", - .type = IA_IFREG, - .hook = meta_name_file_hook, - }, - { .name = "subvolumes", - .type = IA_IFDIR, - .hook = meta_subvolumes_dir_hook, - }, - { .name = "options", - .type = IA_IFDIR, - .hook = meta_options_dir_hook, - }, - { .name = "private", - .type = IA_IFREG, - .hook = meta_private_file_hook, - }, - { .name = "history", - .type = IA_IFREG, - .hook = meta_history_file_hook, - }, - { .name = "meminfo", - .type = IA_IFREG, - .hook = meta_meminfo_file_hook, - }, - { .name = "profile", - .type = IA_IFREG, - .hook = meta_profile_file_hook, - }, - { .name = NULL } -}; - - -static struct meta_ops xlator_dir_ops = { - .fixed_dirents = xlator_dir_dirents -}; - + DOT_DOTDOT, + + { + .name = "view", + .type = IA_IFDIR, + .hook = meta_view_dir_hook, + }, + { + .name = "type", + .type = IA_IFREG, + .hook = meta_type_file_hook, + }, + { + .name = "name", + .type = IA_IFREG, + .hook = meta_name_file_hook, + }, + { + .name = "subvolumes", + .type = IA_IFDIR, + .hook = meta_subvolumes_dir_hook, + }, + { + .name = "options", + .type = IA_IFDIR, + .hook = meta_options_dir_hook, + }, + { + .name = "private", + .type = IA_IFREG, + .hook = meta_private_file_hook, + }, + { + .name = "history", + .type = IA_IFREG, + .hook = meta_history_file_hook, + }, + { + .name = "meminfo", + .type = IA_IFREG, + .hook = meta_meminfo_file_hook, + }, + { + .name = "profile", + .type = IA_IFREG, + .hook = meta_profile_file_hook, + }, + {.name = NULL}}; + +static struct meta_ops xlator_dir_ops = {.fixed_dirents = xlator_dir_dirents}; int -meta_xlator_dir_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_xlator_dir_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - glusterfs_graph_t *graph = NULL; - xlator_t *xl = NULL; + glusterfs_graph_t *graph = NULL; + xlator_t *xl = NULL; - graph = meta_ctx_get (loc->parent, this); + graph = meta_ctx_get(loc->parent, this); - xl = xlator_search_by_name (graph->first, loc->name); + xl = xlator_search_by_name(graph->first, loc->name); - meta_ctx_set (loc->inode, this, xl); + meta_ctx_set(loc->inode, this, xl); - meta_ops_set (loc->inode, this, &xlator_dir_ops); + meta_ops_set(loc->inode, this, &xlator_dir_ops); - return 0; + return 0; } - int -meta_master_dir_hook (call_frame_t *frame, xlator_t *this, loc_t *loc, - dict_t *xdata) +meta_master_dir_hook(call_frame_t *frame, xlator_t *this, loc_t *loc, + dict_t *xdata) { - meta_ctx_set (loc->inode, this, this->ctx->master); + meta_ctx_set(loc->inode, this, this->ctx->master); - meta_ops_set (loc->inode, this, &xlator_dir_ops); + meta_ops_set(loc->inode, this, &xlator_dir_ops); - return 0; + return 0; } |