diff options
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/features/read-only/src/worm-helper.c | 4 | ||||
| -rw-r--r-- | xlators/features/read-only/src/worm.c | 5 | 
2 files changed, 5 insertions, 4 deletions
diff --git a/xlators/features/read-only/src/worm-helper.c b/xlators/features/read-only/src/worm-helper.c index 692899d9379..81a167e3c63 100644 --- a/xlators/features/read-only/src/worm-helper.c +++ b/xlators/features/read-only/src/worm-helper.c @@ -305,7 +305,6 @@ gf_worm_state_transition (xlator_t *this, gf_boolean_t fop_with_fd,          int op_errno                      =       EROFS;          int ret                           =       -1;          uint64_t com_period               =       0; -        uint64_t ret_period               =       0;          uint64_t start_time               =       0;          dict_t *dict                      =       NULL;          worm_reten_state_t reten_state    =       {0,}; @@ -356,8 +355,7 @@ gf_worm_state_transition (xlator_t *this, gf_boolean_t fop_with_fd,          }          if (ret == -1 && (time (NULL) - start_time) >= com_period) { -                ret_period = priv->reten_period; -                if ((time (NULL) - stbuf.ia_mtime) >= ret_period) { +                if ((time (NULL) - stbuf.ia_mtime) >= com_period) {                          ret = worm_set_state(this, fop_with_fd, file_ptr,                                               &reten_state, &stbuf);                          if (ret) { diff --git a/xlators/features/read-only/src/worm.c b/xlators/features/read-only/src/worm.c index ad06f46a4e4..3e32d65dbac 100644 --- a/xlators/features/read-only/src/worm.c +++ b/xlators/features/read-only/src/worm.c @@ -370,8 +370,11 @@ worm_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,                  goto out;          }          ret = worm_get_state (this, _gf_true, fd, &reten_state); -        if (ret) +        if (ret) { +                if (ret == -1) +                        op_errno = 0;                  goto out; +        }          if (!reten_state.worm)                  op_errno = 0;  | 
