From patchwork Mon Jul 1 15:32:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Stancek X-Patchwork-Id: 2808521 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A144DBF4A1 for ; Mon, 1 Jul 2013 15:32:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 876322011E for ; Mon, 1 Jul 2013 15:32:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D6922011B for ; Mon, 1 Jul 2013 15:32:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754489Ab3GAPcu (ORCPT ); Mon, 1 Jul 2013 11:32:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11021 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754487Ab3GAPct (ORCPT ); Mon, 1 Jul 2013 11:32:49 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r61FWlvH011949 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 1 Jul 2013 11:32:48 -0400 Received: from dustball.brq.redhat.com (dustball.brq.redhat.com [10.34.26.57]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r61FWj3K032002; Mon, 1 Jul 2013 11:32:46 -0400 From: Jan Stancek To: linux-nfs@vger.kernel.org Cc: bfields@redhat.com, Trond.Myklebust@netapp.com Subject: [PATCH] NFS: fix NFSv3 with sec=krb5 and CONFIG_NFS_V3_ACL=y Date: Mon, 1 Jul 2013 17:32:34 +0200 Message-Id: <682ebd8ecc7309b18396da356a0feb38bfa41674.1372692346.git.jstancek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Starting with commit: commit f994c43d19a9116727d4c228d3f13db595bff562 Author: Trond Myklebust Date: Thu Nov 1 12:14:14 2012 -0400 SUNRPC: Clean up rpc_bind_new_program operations on directory mounted with -onfsvers=3,tcp,sec=krb5 fail with Input/Output error after ~60 second timeout. This is presumably because upcalls for 'nfsacl' are not getting anywhere. This patch enables pipe dir for nfsacl_program and changes its name to 'nfs'. This name will be used in upcalls and whole setup should work as it did in past - just with nfs/hostname principal. Signed-off-by: Jan Stancek --- fs/nfs/nfs3client.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/nfs/nfs3client.c b/fs/nfs/nfs3client.c index b3fc65e..09a7d06 100644 --- a/fs/nfs/nfs3client.c +++ b/fs/nfs/nfs3client.c @@ -9,11 +9,12 @@ static const struct rpc_version *nfsacl_version[] = { }; const struct rpc_program nfsacl_program = { - .name = "nfsacl", + .name = "nfs", .number = NFS_ACL_PROGRAM, .nrvers = ARRAY_SIZE(nfsacl_version), .version = nfsacl_version, .stats = &nfsacl_rpcstat, + .pipe_dir_name = NFS_PIPE_DIRNAME, }; /*