diff options
| author | Raghavendra Bhat <raghavendrabhat@gluster.com> | 2011-03-22 05:01:56 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2011-03-25 04:11:54 -0700 |
| commit | 89b45f610dfc455dd6c8fd84c1d3c9945ad62f4c (patch) | |
| tree | 47934dce791870157df79abf28657e956cd83eba | |
| parent | cd3d977b10e24c4b46e55f9831113aba3a241583 (diff) | |
send proper device id to posix while self healing device file entry
Signed-off-by: Raghavendra Bhat <raghavendrabhat@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 2567 (self heal on device files changes the major and minor number)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2567
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 16e051c6ff9..aba43530fdd 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -931,8 +931,9 @@ sh_missing_entries_mknod (call_frame_t *frame, xlator_t *this) int enoent_count = 0; int call_count = 0; mode_t st_mode = 0; - dev_t ia_dev = 0; + dev_t ia_rdev = 0; dict_t *dict = NULL; + dev_t st_rdev = 0; local = frame->local; sh = &local->self_heal; @@ -947,11 +948,12 @@ sh_missing_entries_mknod (call_frame_t *frame, xlator_t *this) st_mode = st_mode_from_ia (sh->buf[sh->source].ia_prot, sh->buf[sh->source].ia_type); - ia_dev = sh->buf[sh->source].ia_dev; + ia_rdev = sh->buf[sh->source].ia_rdev; + st_rdev = makedev (ia_major (ia_rdev), ia_minor (ia_rdev)); gf_log (this->name, GF_LOG_TRACE, - "mknod %s mode 0%o on %d subvolumes", - local->loc.path, st_mode, enoent_count); + "mknod %s mode 0%o device type %"PRId64" on %d subvolumes", + local->loc.path, st_mode, (uint64_t)st_rdev, enoent_count); dict = dict_new (); if (!dict) @@ -968,7 +970,7 @@ sh_missing_entries_mknod (call_frame_t *frame, xlator_t *this) (void *) (long) i, priv->children[i], priv->children[i]->fops->mknod, - &local->loc, st_mode, ia_dev, dict); + &local->loc, st_mode, st_rdev, dict); if (!--call_count) break; } @@ -1253,21 +1255,24 @@ sh_missing_entries_lookup_cbk (call_frame_t *frame, void *cookie, afr_local_t *local = NULL; int call_count = 0; afr_private_t *priv = NULL; - + mode_t st_mode = 0; local = frame->local; priv = this->private; child_index = (long) cookie; + if (buf) + st_mode = st_mode_from_ia (buf->ia_prot, buf->ia_type); + LOCK (&frame->lock); { if (op_ret == 0) { gf_log (this->name, GF_LOG_TRACE, "path %s on subvolume %s is of mode 0%o", - local->loc.path, - priv->children[child_index]->name, - buf->ia_type); + local->loc.path, + priv->children[child_index]->name, + st_mode); local->self_heal.buf[child_index] = *buf; local->self_heal.parentbuf = *postparent; |