From e16868dede6455cab644805af6fe1ac312775e13 Mon Sep 17 00:00:00 2001 From: Gluster Ant Date: Wed, 12 Sep 2018 17:52:45 +0530 Subject: Land part 2 of clang-format changes Change-Id: Ia84cc24c8924e6d22d02ac15f611c10e26db99b4 Signed-off-by: Nigel Babu --- xlators/features/utime/src/utime-helpers.c | 85 ++++++------- xlators/features/utime/src/utime.c | 198 +++++++++++------------------ 2 files changed, 118 insertions(+), 165 deletions(-) (limited to 'xlators/features/utime') diff --git a/xlators/features/utime/src/utime-helpers.c b/xlators/features/utime/src/utime-helpers.c index 6cac9651190..2d74bc76e07 100644 --- a/xlators/features/utime/src/utime-helpers.c +++ b/xlators/features/utime/src/utime-helpers.c @@ -11,85 +11,84 @@ #include "utime-helpers.h" void -gl_timespec_get (struct timespec *ts) +gl_timespec_get(struct timespec *ts) { - #ifdef TIME_UTC - timespec_get (ts, TIME_UTC); - #else - timespec_now (ts); - #endif +#ifdef TIME_UTC + timespec_get(ts, TIME_UTC); +#else + timespec_now(ts); +#endif } void utime_update_attribute_flags(call_frame_t *frame, glusterfs_fop_t fop) { + if (!frame) { + goto out; + } - if (!frame) { - goto out; - } - - switch (fop) { + switch (fop) { case GF_FOP_SETXATTR: case GF_FOP_FSETXATTR: - frame->root->flags |= MDATA_CTIME; - break; + frame->root->flags |= MDATA_CTIME; + break; case GF_FOP_FALLOCATE: case GF_FOP_ZEROFILL: - frame->root->flags |= MDATA_MTIME; - frame->root->flags |= MDATA_ATIME; - break; + frame->root->flags |= MDATA_MTIME; + frame->root->flags |= MDATA_ATIME; + break; case GF_FOP_OPENDIR: case GF_FOP_OPEN: case GF_FOP_READ: - frame->root->flags |= MDATA_ATIME; - break; + frame->root->flags |= MDATA_ATIME; + break; case GF_FOP_MKNOD: case GF_FOP_MKDIR: case GF_FOP_SYMLINK: case GF_FOP_CREATE: - frame->root->flags |= MDATA_ATIME; - frame->root->flags |= MDATA_CTIME; - frame->root->flags |= MDATA_MTIME; - frame->root->flags |= MDATA_PAR_CTIME; - frame->root->flags |= MDATA_PAR_MTIME; - break; + frame->root->flags |= MDATA_ATIME; + frame->root->flags |= MDATA_CTIME; + frame->root->flags |= MDATA_MTIME; + frame->root->flags |= MDATA_PAR_CTIME; + frame->root->flags |= MDATA_PAR_MTIME; + break; case GF_FOP_UNLINK: case GF_FOP_RMDIR: - frame->root->flags |= MDATA_CTIME; - frame->root->flags |= MDATA_PAR_CTIME; - frame->root->flags |= MDATA_PAR_MTIME; - break; + frame->root->flags |= MDATA_CTIME; + frame->root->flags |= MDATA_PAR_CTIME; + frame->root->flags |= MDATA_PAR_MTIME; + break; case GF_FOP_WRITE: - frame->root->flags |= MDATA_MTIME; - frame->root->flags |= MDATA_CTIME; - break; + frame->root->flags |= MDATA_MTIME; + frame->root->flags |= MDATA_CTIME; + break; case GF_FOP_LINK: case GF_FOP_RENAME: - frame->root->flags |= MDATA_CTIME; - frame->root->flags |= MDATA_PAR_CTIME; - frame->root->flags |= MDATA_PAR_MTIME; - break; + frame->root->flags |= MDATA_CTIME; + frame->root->flags |= MDATA_PAR_CTIME; + frame->root->flags |= MDATA_PAR_MTIME; + break; case GF_FOP_TRUNCATE: case GF_FOP_FTRUNCATE: - frame->root->flags |= MDATA_CTIME; - frame->root->flags |= MDATA_MTIME; - break; + frame->root->flags |= MDATA_CTIME; + frame->root->flags |= MDATA_MTIME; + break; case GF_FOP_REMOVEXATTR: case GF_FOP_FREMOVEXATTR: - frame->root->flags |= MDATA_CTIME; - break; + frame->root->flags |= MDATA_CTIME; + break; default: - frame->root->flags = 0; - } + frame->root->flags = 0; + } out: - return; + return; } diff --git a/xlators/features/utime/src/utime.c b/xlators/features/utime/src/utime.c index a8d74d9cb5c..7671904b717 100644 --- a/xlators/features/utime/src/utime.c +++ b/xlators/features/utime/src/utime.c @@ -11,218 +11,172 @@ #include "utime.h" int32_t -gf_utime_invalidate (xlator_t *this, - inode_t *inode) +gf_utime_invalidate(xlator_t *this, inode_t *inode) { - return 0; + return 0; } - int32_t -gf_utime_forget (xlator_t *this, - inode_t *inode) +gf_utime_forget(xlator_t *this, inode_t *inode) { - return 0; + return 0; } - int32_t -gf_utime_client_destroy (xlator_t *this, - client_t *client) +gf_utime_client_destroy(xlator_t *this, client_t *client) { - return 0; + return 0; } - void -gf_utime_ictxmerge (xlator_t *this, - fd_t *fd, - inode_t *inode, - inode_t *linked_inode) +gf_utime_ictxmerge(xlator_t *this, fd_t *fd, inode_t *inode, + inode_t *linked_inode) { - return; + return; } - int32_t -gf_utime_release (xlator_t *this, - fd_t *fd) +gf_utime_release(xlator_t *this, fd_t *fd) { - return 0; + return 0; } - int32_t -gf_utime_releasedir (xlator_t *this, - fd_t *fd) +gf_utime_releasedir(xlator_t *this, fd_t *fd) { - return 0; + return 0; } - int32_t -gf_utime_client_disconnect (xlator_t *this, - client_t *client) +gf_utime_client_disconnect(xlator_t *this, client_t *client) { - return 0; + return 0; } - int32_t -gf_utime_fdctx_to_dict (xlator_t *this, - fd_t *fd, - dict_t *dict) +gf_utime_fdctx_to_dict(xlator_t *this, fd_t *fd, dict_t *dict) { - return 0; + return 0; } - int32_t -gf_utime_inode (xlator_t *this) +gf_utime_inode(xlator_t *this) { - return 0; + return 0; } - int32_t -gf_utime_inode_to_dict (xlator_t *this, - dict_t *dict) +gf_utime_inode_to_dict(xlator_t *this, dict_t *dict) { - return 0; + return 0; } - int32_t -gf_utime_history (xlator_t *this) +gf_utime_history(xlator_t *this) { - return 0; + return 0; } - int32_t -gf_utime_fd (xlator_t *this) +gf_utime_fd(xlator_t *this) { - return 0; + return 0; } - int32_t -gf_utime_fd_to_dict (xlator_t *this, - dict_t *dict) +gf_utime_fd_to_dict(xlator_t *this, dict_t *dict) { - return 0; + return 0; } - int32_t -gf_utime_fdctx (xlator_t *this, - fd_t *fd) +gf_utime_fdctx(xlator_t *this, fd_t *fd) { - return 0; + return 0; } - int32_t -gf_utime_inodectx (xlator_t *this, - inode_t *ino) +gf_utime_inodectx(xlator_t *this, inode_t *ino) { - return 0; + return 0; } - int32_t -gf_utime_inodectx_to_dict (xlator_t *this, - inode_t *ino, - dict_t *dict) +gf_utime_inodectx_to_dict(xlator_t *this, inode_t *ino, dict_t *dict) { - return 0; + return 0; } - int32_t -gf_utime_priv_to_dict (xlator_t *this, - dict_t *dict, char *brickname) +gf_utime_priv_to_dict(xlator_t *this, dict_t *dict, char *brickname) { - return 0; + return 0; } - int32_t -gf_utime_priv (xlator_t *this) +gf_utime_priv(xlator_t *this) { - return 0; + return 0; } - int32_t -init (xlator_t *this) +init(xlator_t *this) { - return 0; + return 0; } void -fini (xlator_t *this) +fini(xlator_t *this) { - return; + return; } int32_t -reconfigure (xlator_t *this, dict_t *dict) +reconfigure(xlator_t *this, dict_t *dict) { - return 0; + return 0; } int -notify (xlator_t *this, int event, void *data, ...) +notify(xlator_t *this, int event, void *data, ...) { - return default_notify (this, event, data); + return default_notify(this, event, data); } - struct xlator_fops fops = { - /* TODO: Need to go through other fops and - * check if they modify time attributes - */ - .rename = gf_utime_rename, - .mknod = gf_utime_mknod, - .readv = gf_utime_readv, - .fremovexattr = gf_utime_fremovexattr, - .open = gf_utime_open, - .create = gf_utime_create, - .mkdir = gf_utime_mkdir, - .writev = gf_utime_writev, - .rmdir = gf_utime_rmdir, - .fallocate = gf_utime_fallocate, - .truncate = gf_utime_truncate, - .symlink = gf_utime_symlink, - .zerofill = gf_utime_zerofill, - .link = gf_utime_link, - .ftruncate = gf_utime_ftruncate, - .unlink = gf_utime_unlink, - .setattr = gf_utime_setattr, - .fsetattr = gf_utime_fsetattr, - .opendir = gf_utime_opendir, - .removexattr = gf_utime_removexattr, + /* TODO: Need to go through other fops and + * check if they modify time attributes + */ + .rename = gf_utime_rename, .mknod = gf_utime_mknod, + .readv = gf_utime_readv, .fremovexattr = gf_utime_fremovexattr, + .open = gf_utime_open, .create = gf_utime_create, + .mkdir = gf_utime_mkdir, .writev = gf_utime_writev, + .rmdir = gf_utime_rmdir, .fallocate = gf_utime_fallocate, + .truncate = gf_utime_truncate, .symlink = gf_utime_symlink, + .zerofill = gf_utime_zerofill, .link = gf_utime_link, + .ftruncate = gf_utime_ftruncate, .unlink = gf_utime_unlink, + .setattr = gf_utime_setattr, .fsetattr = gf_utime_fsetattr, + .opendir = gf_utime_opendir, .removexattr = gf_utime_removexattr, }; struct xlator_cbks cbks = { - .invalidate = gf_utime_invalidate, - .forget = gf_utime_forget, - .client_destroy = gf_utime_client_destroy, - .ictxmerge = gf_utime_ictxmerge, - .release = gf_utime_release, - .releasedir = gf_utime_releasedir, - .client_disconnect = gf_utime_client_disconnect, + .invalidate = gf_utime_invalidate, + .forget = gf_utime_forget, + .client_destroy = gf_utime_client_destroy, + .ictxmerge = gf_utime_ictxmerge, + .release = gf_utime_release, + .releasedir = gf_utime_releasedir, + .client_disconnect = gf_utime_client_disconnect, }; struct xlator_dumpops dumpops = { - .fdctx_to_dict = gf_utime_fdctx_to_dict, - .inode = gf_utime_inode, - .inode_to_dict = gf_utime_inode_to_dict, - .history = gf_utime_history, - .fd = gf_utime_fd, - .fd_to_dict = gf_utime_fd_to_dict, - .fdctx = gf_utime_fdctx, - .inodectx = gf_utime_inodectx, - .inodectx_to_dict = gf_utime_inodectx_to_dict, - .priv_to_dict = gf_utime_priv_to_dict, - .priv = gf_utime_priv, + .fdctx_to_dict = gf_utime_fdctx_to_dict, + .inode = gf_utime_inode, + .inode_to_dict = gf_utime_inode_to_dict, + .history = gf_utime_history, + .fd = gf_utime_fd, + .fd_to_dict = gf_utime_fd_to_dict, + .fdctx = gf_utime_fdctx, + .inodectx = gf_utime_inodectx, + .inodectx_to_dict = gf_utime_inodectx_to_dict, + .priv_to_dict = gf_utime_priv_to_dict, + .priv = gf_utime_priv, }; -- cgit