From patchwork Thu Mar 6 22:02:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 3786591 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 CFB62BF540 for ; Thu, 6 Mar 2014 22:03:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D50C520213 for ; Thu, 6 Mar 2014 22:03:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 601FB20173 for ; Thu, 6 Mar 2014 22:03:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750919AbaCFWDO (ORCPT ); Thu, 6 Mar 2014 17:03:14 -0500 Received: from mout.perfora.net ([74.208.4.194]:61778 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750790AbaCFWDN (ORCPT ); Thu, 6 Mar 2014 17:03:13 -0500 Received: from rees.org (74-126-0-171.static.123.net [74.126.0.171]) by mrelay.perfora.net (node=mrus4) with ESMTP (Nemesis) id 0MUHww-1WmWwC1vIg-00Qcuk; Thu, 06 Mar 2014 17:03:09 -0500 From: Jim Rees To: Steve Dickson Cc: linux-nfs@vger.kernel.org Subject: [PATCH] fix intr/nointr to match kernel behavior (ignored) Date: Thu, 6 Mar 2014 17:02:32 -0500 Message-Id: <1394143352-26095-1-git-send-email-rees@umich.edu> X-Mailer: git-send-email 1.9.0 X-Provags-ID: V02:K0:3ykAhWUTJ7INYM6Ubof1b6WNZaaR/c+9QEqjcfC3Gmj 5yrMqhI6L8D6HhPmFIhM1mFQ2LzvuLZkOmPOfeCeXq9/PWIUBY nOB2wzMtE5xvhIdmT51TzRgTQ1F1uuoaWt0MuXwDfXl5WZT8sI 10qx8UdQM/rB5LVT2mK+CuJhbECdWYIUBpes2LqTYxovw1pG0Q LBjb6bCmXysRmytAdUbmtDVNlC4yzXKTZq/fSGzxX99tZ8p1Ch to6pvIbOFiPQ4EY26y7umx/as5fuyvnuf62ohi1ULkIBv+RXyG 7PtZxMKLutE1ouwMxE/en8sTa0HLdOyzlxBF0tSTZXORwtydte QTVrl5VOKJ2dyO+IjlynNnZQpNNyZz3aF9GVQ42tx 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, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Signed-off-by: Jim Rees --- utils/mount/nfs.man | 53 ++++++----------------------------------------------- 1 file changed, 6 insertions(+), 47 deletions(-) diff --git a/utils/mount/nfs.man b/utils/mount/nfs.man index ef09a31..2ab369c 100644 --- a/utils/mount/nfs.man +++ b/utils/mount/nfs.man @@ -125,6 +125,12 @@ option may mitigate some of the risks of using the .B soft option. .TP 1.5i +.BR intr " / " nointr +This option is provided for backward compatibility. +It is ignored after kernel 2.6.25. +System calls return EINTR if an in-progress NFS operation is interrupted by +a signal. +.TP 1.5i .BI timeo= n The time in deciseconds (tenths of a second) the NFS client waits for a response before it retries an NFS request. @@ -668,30 +674,6 @@ Using the option is also required when mounting exports on NFS servers that do not support the NLM protocol. .TP 1.5i -.BR intr " / " nointr -Selects whether to allow signals to interrupt file operations -on this mount point. If neither option -is specified (or if -.B nointr -is specified), -signals do not interrupt NFS file operations. If -.B intr -is specified, system calls return EINTR if an in-progress NFS operation is interrupted by -a signal. -.IP -Using the -.B intr -option is preferred to using the -.B soft -option because it is significantly less likely to result in data corruption. -.IP -The -.BR intr " / " nointr -mount option is deprecated after kernel 2.6.25. -Only SIGKILL can interrupt a pending NFS operation on these kernels, -and if specified, this mount option is ignored to provide backwards -compatibility with older kernels. -.TP 1.5i .BR cto " / " nocto Selects whether to use close-to-open cache coherence semantics. If neither option is specified (or if @@ -807,29 +789,6 @@ The mount request fails if the server's rpcbind service is not available, the server's NFS service is not registered with its rpcbind service, or the server's NFS service is not available on the advertised port. .TP 1.5i -.BR intr " / " nointr -Selects whether to allow signals to interrupt file operations -on this mount point. If neither option is specified (or if -.B intr -is specified), system calls return EINTR if an in-progress NFS operation -is interrupted by a signal. If -.B nointr -is specified, signals do not -interrupt NFS operations. -.IP -Using the -.B intr -option is preferred to using the -.B soft -option because it is significantly less likely to result in data corruption. -.IP -The -.BR intr " / " nointr -mount option is deprecated after kernel 2.6.25. -Only SIGKILL can interrupt a pending NFS operation on these kernels, -and if specified, this mount option is ignored to provide backwards -compatibility with older kernels. -.TP 1.5i .BR cto " / " nocto Selects whether to use close-to-open cache coherence semantics for NFS directories on this mount point.