From patchwork Thu Jan 17 16:53:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 1997181 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B657A3FE1B for ; Thu, 17 Jan 2013 16:54:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757374Ab3AQQx3 (ORCPT ); Thu, 17 Jan 2013 11:53:29 -0500 Received: from mail-la0-f45.google.com ([209.85.215.45]:60505 "EHLO mail-la0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757365Ab3AQQx1 (ORCPT ); Thu, 17 Jan 2013 11:53:27 -0500 Received: by mail-la0-f45.google.com with SMTP id ep20so2869248lab.4 for ; Thu, 17 Jan 2013 08:53:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=tUc1FEnVKfYKTsnBpLxzEa++idGotmtvKh58ZMqXJYk=; b=jJUXiY2qd5mdp2NZcJX2HWj+JlEqlo2rzQnoc4BjOM9LgnVrDUD3sovNQ4NTKAmGJQ 8tuM1RfT+olodJ3MKYWKKncs48pFteR4rbPmh17MShMvBAbbORSHs2gN/SNfJH+qCYB9 +bXkJTHhb89u6nDhIjHar6HpbQms0V8FfNPRYW9MhCX/wQxfIWnU59cxmfPlFNQzCggV BTL1Ru/GfWIT6lTysWiP/dnuPiBIaPVtlNJiL6Rg52diuSoDKKoRhlAhm6actUY9kmzB 5WYcV8f42BGEAl2eDuWPaA7k2EuW6W5wuzfw6MDyTaTTZVcvT+q9Zu+JZwWku6hF9ped 40kQ== X-Received: by 10.112.43.3 with SMTP id s3mr2489866lbl.132.1358441604950; Thu, 17 Jan 2013 08:53:24 -0800 (PST) Received: from builder.office.etersoft.ru (pritvor.etersoft.ru. [91.232.225.2]) by mx.google.com with ESMTPS id z4sm1067635lbn.17.2013.01.17.08.53.23 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Jan 2013 08:53:24 -0800 (PST) From: Pavel Shilovsky To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, wine-devel@winehq.org Subject: [PATCH v2 6/8] CIFS: Translate SHARING_VIOLATION to -ETXTBSY error code for SMB2 Date: Thu, 17 Jan 2013 20:53:02 +0400 Message-Id: <1358441584-8783-6-git-send-email-piastry@etersoft.ru> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1358441584-8783-1-git-send-email-piastry@etersoft.ru> References: <1358441584-8783-1-git-send-email-piastry@etersoft.ru> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org to make it match CIFS and VFS variants. Signed-off-by: Pavel Shilovsky --- fs/cifs/smb2maperror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c index 494c912..11e589e 100644 --- a/fs/cifs/smb2maperror.c +++ b/fs/cifs/smb2maperror.c @@ -356,7 +356,7 @@ static const struct status_to_posix_error smb2_error_map_table[] = { {STATUS_PORT_CONNECTION_REFUSED, -ECONNREFUSED, "STATUS_PORT_CONNECTION_REFUSED"}, {STATUS_INVALID_PORT_HANDLE, -EIO, "STATUS_INVALID_PORT_HANDLE"}, - {STATUS_SHARING_VIOLATION, -EBUSY, "STATUS_SHARING_VIOLATION"}, + {STATUS_SHARING_VIOLATION, -ETXTBSY, "STATUS_SHARING_VIOLATION"}, {STATUS_QUOTA_EXCEEDED, -EDQUOT, "STATUS_QUOTA_EXCEEDED"}, {STATUS_INVALID_PAGE_PROTECTION, -EIO, "STATUS_INVALID_PAGE_PROTECTION"},