From patchwork Thu Nov 14 07:45:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Sorenson X-Patchwork-Id: 11243135 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15132138C for ; Thu, 14 Nov 2019 07:45:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8F2F20718 for ; Thu, 14 Nov 2019 07:45:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bt/3U1Kw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726000AbfKNHpp (ORCPT ); Thu, 14 Nov 2019 02:45:45 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:45724 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725852AbfKNHpp (ORCPT ); Thu, 14 Nov 2019 02:45:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573717543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rzSMKodyGhPRjFFhoPJZENJjXFnwDOkBc7ZUSyhkT+g=; b=bt/3U1KwkwSfaBO7dM8fvMfvQ8A7Dp1YxRCc1VUFfWKIRFHCcideXhv5hoiHxgE9EglYU7 xaSYZzBmonfLxK/r9c4QlSwkIY2tDSiNLkVOvLk8pUMORp4SLpEEd9szDih3/wWk7e/P7x OYNSnVwwYc/Qs0fxAmyWgc6zGcB0iO0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-379-TI_W6yTWOT-pKJgJy6lg9A-1; Thu, 14 Nov 2019 02:45:42 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D94D3805A65; Thu, 14 Nov 2019 07:45:41 +0000 (UTC) Received: from hut.sorensonfamily.com.com (ovpn-116-27.phx2.redhat.com [10.3.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2C6B6953F; Thu, 14 Nov 2019 07:45:38 +0000 (UTC) From: Frank Sorenson To: linux-xfs@vger.kernel.org Cc: sandeen@sandeen.net, sorenson@redhat.com Subject: [PATCH] xfs_restore: Return error if error occurs restoring extent Date: Thu, 14 Nov 2019 01:45:38 -0600 Message-Id: <20191114074538.1220512-1-sorenson@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: TI_W6yTWOT-pKJgJy6lg9A-1 X-Mimecast-Spam-Score: 0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org If an error occurs during write while restoring an extent, no error is currently propagated back to the caller, so xfsrestore can return SUCCESS on a failed restore. Make restore_extent return an error code indicating the restore was incomplete. Signed-off-by: Frank Sorenson --- restore/content.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/restore/content.c b/restore/content.c index 6b22965..c267234 100644 --- a/restore/content.c +++ b/restore/content.c @@ -8446,6 +8446,7 @@ restore_extent(filehdr_t *fhdrp, off64_t new_off; struct dioattr da; bool_t isrealtime = BOOL_FALSE; + rv_t rv = RV_OK; *bytesreadp = 0; @@ -8496,7 +8497,6 @@ restore_extent(filehdr_t *fhdrp, req_bufsz = (size_t)min((off64_t)INTGENMAX, sz); bufp = (*dop->do_read)(drivep, req_bufsz, &sup_bufsz, &rval); if (rval) { - rv_t rv; char *reasonstr; switch(rval) { case DRIVE_ERROR_EOF: @@ -8665,12 +8665,13 @@ restore_extent(filehdr_t *fhdrp, fd = -1; assert(ntowrite <= (size_t)INTGENMAX); nwritten = (int)ntowrite; + rv = RV_INCOMPLETE; } sz -= (off64_t)sup_bufsz; off += (off64_t)nwritten; } - return RV_OK; + return rv; } static char *extattrbufp = 0; /* ptr to start of all the extattr buffers */