--- ./fs/vzdquot.c.vzdqdebug 2005-11-29 13:34:21.000000000 +0300 +++ ./fs/vzdquot.c 2005-12-02 14:09:01.000000000 +0300 @@ -1016,7 +1016,6 @@ static void vzquota_det_qmblk_recalc(str time_t timeout; cnt = 0; - timeout = 0; parent = NULL; start: /* @@ -1027,19 +1026,16 @@ start: if (!vzquota_qlnk_is_empty(INODE_QLNK(inode))) return; + timeout = 3; qmblk = __VZ_QUOTA_NOQUOTA(inode->i_sb); msg = "detached inode not in creation"; if (inode->i_op != VZ_QUOTA_EMPTY_IOPS) goto fail; qmblk = VZ_QUOTA_BAD; msg = "unexpected creation context"; - if (!vzquota_cur_qmblk_check()) { - /* qmblk may have unexpected creation context - * up to 3 seconds */ - timeout = 3; + if (!vzquota_cur_qmblk_check()) goto fail; - } - + timeout = 0; parent = vzquota_cur_qmblk_fetch(); msg = "uninitialized parent"; if (vzquota_qlnk_is_empty(INODE_QLNK(parent)))