diff options
| -rw-r--r-- | libglusterfs/src/common-utils.c | 8 | ||||
| -rw-r--r-- | libglusterfs/src/common-utils.h | 2 | ||||
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.h | 1 | ||||
| -rw-r--r-- | xlators/mount/fuse/src/fuse-helpers.c | 30 | ||||
| -rw-r--r-- | xlators/performance/io-threads/src/io-threads.c | 2 |
5 files changed, 6 insertions, 37 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c index 0e133c005..5e849e066 100644 --- a/libglusterfs/src/common-utils.c +++ b/libglusterfs/src/common-utils.c @@ -2017,14 +2017,6 @@ get_mem_size () return memsize; } - -int -gf_client_pid_check (gf_client_pid_t npid) -{ - return ( (npid > GF_CLIENT_PID_MIN) && (npid < GF_CLIENT_PID_MAX) ) - ? 0 : -1; -} - /* Strips all whitespace characters in a string and returns length of new string * on success */ diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index 7e6da9ed2..c15abdbaa 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -105,7 +105,6 @@ enum _gf_client_pid GF_CLIENT_PID_GSYNCD = -1, GF_CLIENT_PID_HADOOP = -2, GF_CLIENT_PID_DEFRAG = -3, - GF_CLIENT_PID_MIN = -4 }; typedef enum _gf_boolean gf_boolean_t; @@ -493,6 +492,5 @@ char *get_host_name (char *word, char **host); char *get_path_name (char *word, char **path); void gf_path_strip_trailing_slashes (char *path); uint64_t get_mem_size (); -int gf_client_pid_check (gf_client_pid_t npid); int gf_strip_whitespace (char *str, int len); #endif /* _COMMON_UTILS_H */ diff --git a/xlators/mount/fuse/src/fuse-bridge.h b/xlators/mount/fuse/src/fuse-bridge.h index d20413055..3711ca54d 100644 --- a/xlators/mount/fuse/src/fuse-bridge.h +++ b/xlators/mount/fuse/src/fuse-bridge.h @@ -350,7 +350,6 @@ inode_t *fuse_ino_to_inode (uint64_t ino, xlator_t *fuse); int send_fuse_err (xlator_t *this, fuse_in_header_t *finh, int error); int fuse_gfid_set (fuse_state_t *state); int fuse_flip_xattr_ns (struct fuse_private *priv, char *okey, char **nkey); -int fuse_xattr_alloc_default (char *okey, char **nkey); fuse_fd_ctx_t * __fuse_fd_ctx_check_n_create (fd_t *fd, xlator_t *this); fuse_fd_ctx_t * fuse_fd_ctx_check_n_create (fd_t *fd, xlator_t *this); diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c index 8af19de9d..452a48194 100644 --- a/xlators/mount/fuse/src/fuse-helpers.c +++ b/xlators/mount/fuse/src/fuse-helpers.c @@ -450,7 +450,7 @@ fuse_do_flip_xattr_ns (char *okey, const char *nns, char **nkey) return ret; } -int +static int fuse_xattr_alloc_default (char *okey, char **nkey) { int ret = 0; @@ -469,28 +469,12 @@ fuse_flip_xattr_ns (fuse_private_t *priv, char *okey, char **nkey) { int ret = 0; gf_boolean_t need_flip = _gf_false; - gf_client_pid_t npid = 0; - - npid = priv->client_pid; - if (gf_client_pid_check (npid)) { - ret = fuse_xattr_alloc_default (okey, nkey); - goto out; - } - - switch (npid) { - /* - * These two cases will never execute as we check the - * pid range above, but are kept to keep the compiler - * happy. - */ - case GF_CLIENT_PID_MAX: - case GF_CLIENT_PID_MIN: - goto out; + switch (priv->client_pid) { case GF_CLIENT_PID_GSYNCD: /* valid xattr(s): *xtime, volume-mark* */ gf_log("glusterfs-fuse", GF_LOG_DEBUG, "PID: %d, checking xattr(s): " - "volume-mark*, *xtime", npid); + "volume-mark*, *xtime", priv->client_pid); if ( (strcmp (okey, UNPRIV_XA_NS".glusterfs.volume-mark") == 0) || (fnmatch (UNPRIV_XA_NS".glusterfs.volume-mark.*", okey, FNM_PERIOD) == 0) || (fnmatch (UNPRIV_XA_NS".glusterfs.*.xtime", okey, FNM_PERIOD) == 0) ) @@ -500,14 +484,10 @@ fuse_flip_xattr_ns (fuse_private_t *priv, char *okey, char **nkey) case GF_CLIENT_PID_HADOOP: /* valid xattr(s): pathinfo */ gf_log("glusterfs-fuse", GF_LOG_DEBUG, "PID: %d, checking xattr(s): " - "pathinfo", npid); + "pathinfo", priv->client_pid); if (strcmp (okey, UNPRIV_XA_NS".glusterfs.pathinfo") == 0) need_flip = _gf_true; break; - - /* This is never true for fuse mount, as defrag uses syncops */ - case GF_CLIENT_PID_DEFRAG: - goto out; } if (need_flip) { @@ -518,6 +498,6 @@ fuse_flip_xattr_ns (fuse_private_t *priv, char *okey, char **nkey) /* if we cannot match, continue with what we got */ ret = fuse_xattr_alloc_default (okey, nkey); } - out: + return ret; } diff --git a/xlators/performance/io-threads/src/io-threads.c b/xlators/performance/io-threads/src/io-threads.c index d316a19a4..66864fcd4 100644 --- a/xlators/performance/io-threads/src/io-threads.c +++ b/xlators/performance/io-threads/src/io-threads.c @@ -202,7 +202,7 @@ iot_schedule (call_frame_t *frame, xlator_t *this, call_stub_t *stub) int ret = -1; iot_pri_t pri = IOT_PRI_MAX - 1; - if (frame->root->pid < 0) { + if (frame->root->pid < GF_CLIENT_PID_MAX) { pri = IOT_PRI_LEAST; goto out; } |