From patchwork Thu Mar 22 04:28:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 889232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ygs2899S"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406DFc1yXyz9s1X for ; Thu, 22 Mar 2018 15:28:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752088AbeCVE2t (ORCPT ); Thu, 22 Mar 2018 00:28:49 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:46512 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752005AbeCVE2q (ORCPT ); Thu, 22 Mar 2018 00:28:46 -0400 Received: by mail-pg0-f49.google.com with SMTP id t12so1057667pgp.13 for ; Wed, 21 Mar 2018 21:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Z4OlguMdJDD+J7mkpnYwb9vZHaJ6MgCCAkctHCJL1Uk=; b=Ygs2899SKBLkLIlzYFkKElRrAs/cGwif/jWHQUOu7ks+6kALB18mqkMtQPRCdvFvxb 1SMDGE6Jfh25976ABiiBo76Z5sEFGEoNRSKWjZsLSvx7jKrFE2yR05wu99NTNFl2fUg2 cW9kaIoe4Ik6rasoKRhhHHLNA1mgya02C1OsxGvuTnI43Ewa/y36YIf/FoyQ5Ew0twhk rohgI9lj8Vb5y49hgMLJc7lEaDx/XacwXN4okzT8XsI1dELkwGKhO4ad/Jsqtveq/wIk 4ky0qbDqg5F/PcvXglKHmoxr6iv+ggZQiMncCO8EN7AVMif7joIxq8nubq5zZ8kU762v MKKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Z4OlguMdJDD+J7mkpnYwb9vZHaJ6MgCCAkctHCJL1Uk=; b=uNErMEF6VZWC9uOZqSy90YTkNRNZC+2WXxrbXdwBxY2y7h8Fi8ttvXiyWKYpgoBgQF 2Y6VL2hgw2KdVEnopVpI50BE/e10Df+Xea5T3qSFHB+PK0uhW8MZl0ZLGDExIy5Tg66k M4g++h3hpymUeyL6/9BhUfrSG58ixMaSKJfhqNGHgbpU+PLYmQJIALIUxhTJVxe3gw1Q cmFmJye3RcTqxnmRZK7gBLbtZWn9RSoTXuCWzQgLWBoN+VCHCnKqvsxKKyLGbOnpWZ2R fQEqNbeTLLv411P/SVkHcGHcEZ9j/2Sy68iQvfOWlQYS+CLH3xFLdypvbSzzbuz58bCn AqPg== X-Gm-Message-State: AElRT7HPWlX75861/COxDbyGV9e1qiA0sbdNhcB66skzm1p2hikjpgX0 G0xIjIARc8kinxyZu7tb1wVY1GqDEH+fSDGe3U3BfvMN X-Google-Smtp-Source: AG47ELsMszK5MHQIIlX4eS6nwDH6Zq0mHUggni0gWMiprrB6Zw7FqdxjDP4WYAWNbbpaXa3LDVZj7ajRN9KHQhkolB8= X-Received: by 10.167.130.151 with SMTP id s23mr277503pfm.106.1521692925156; Wed, 21 Mar 2018 21:28:45 -0700 (PDT) MIME-Version: 1.0 Received: by 10.100.152.97 with HTTP; Wed, 21 Mar 2018 21:28:24 -0700 (PDT) From: Steve French Date: Wed, 21 Mar 2018 23:28:24 -0500 Message-ID: Subject: [PATCH] [SMB3] Don't log expected error on DFS referral request To: CIFS Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org STATUS_FS_DRIVER_REQUIRED is expected when DFS is not turned on on the server. Do not log it on DFS referral response. It clutters the dmesg log unnecessarily at mount time. Reviewed-by: Aurelien Aptel From fe24ab67e94e33b9673ad2ba9a56325baac2f7f7 Mon Sep 17 00:00:00 2001 From: Steve French Date: Wed, 21 Mar 2018 23:16:36 -0500 Subject: [PATCH] [SMB3] Don't log expected error on DFS referral request STATUS_FS_DRIVER_REQUIRED is expected when DFS is not turned on on the server. Do not log it on DFS referral response. It clutters the dmesg log unnecessarily at mount time. Signed-off-by: Steve French --- fs/cifs/smb2maperror.c | 2 +- fs/cifs/smb2ops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c index 62c88dfed57b..3bfc9c990724 100644 --- a/fs/cifs/smb2maperror.c +++ b/fs/cifs/smb2maperror.c @@ -745,7 +745,7 @@ static const struct status_to_posix_error smb2_error_map_table[] = { "STATUS_NOLOGON_SERVER_TRUST_ACCOUNT"}, {STATUS_DOMAIN_TRUST_INCONSISTENT, -EIO, "STATUS_DOMAIN_TRUST_INCONSISTENT"}, - {STATUS_FS_DRIVER_REQUIRED, -EIO, "STATUS_FS_DRIVER_REQUIRED"}, + {STATUS_FS_DRIVER_REQUIRED, -EOPNOTSUPP, "STATUS_FS_DRIVER_REQUIRED"}, {STATUS_IMAGE_ALREADY_LOADED_AS_DLL, -EIO, "STATUS_IMAGE_ALREADY_LOADED_AS_DLL"}, {STATUS_NETWORK_OPEN_RESTRICTION, -EIO, diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index dfd6fb02b7a3..c5777783f313 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1412,7 +1412,7 @@ smb2_get_dfs_refer(const unsigned int xid, struct cifs_ses *ses, } while (rc == -EAGAIN); if (rc) { - if (rc != -ENOENT) + if ((rc != -ENOENT) && (rc != -EOPNOTSUPP)) cifs_dbg(VFS, "ioctl error in smb2_get_dfs_refer rc=%d\n", rc); goto out; } -- 2.14.1