From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68470C433E0 for ; Fri, 3 Jul 2020 21:44:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3ADD920885 for ; Fri, 3 Jul 2020 21:44:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="FQY8eH7N" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727123AbgGCVn4 (ORCPT ); Fri, 3 Jul 2020 17:43:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727028AbgGCVn4 (ORCPT ); Fri, 3 Jul 2020 17:43:56 -0400 Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7493C061794; Fri, 3 Jul 2020 14:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=4dSawoUbToBjQYPQeKu/vzB/+jr94zPa4ftwUT26O9o=; b=FQY8eH7NIX5N2+6YzPa/p7i8cz MF2x/KxqTmwJuCuOd4UfLyGT5QFtwIU9fc5HnT2wmrLfh6JYKbBWA1s1aPI3FXnxw+qF7idP8vPAU 4uKGmx1Ewgs3akvMX3yIH0DE1Xqiayl+wYo/oIVQwtosnwnVX7zCNwsANO/IkAzVroVTZhfstH5rD FngNaGGHCn2X7P6rW+3uFQww3Rf6W45T3IXxMBnhV0K4PkIWL9+P7yeR2DGW9S2PWclqIX+M6Z51g 4L9aR7Ssy0XGRCqVszKCww80n5XEtshMOxIQh54yhrTswTiKZ/cfTTQm4I5uvdoucelySkuzV1LI0 3Xwoa/hQ==; Received: from [2601:1c0:6280:3f0::19c2] (helo=smtpauth.infradead.org) by merlin.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrTTN-0006uZ-95; Fri, 03 Jul 2020 21:43:53 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Jonathan Corbet , linux-doc@vger.kernel.org, Ian Kent , autofs@vger.kernel.org, David Howells , linux-cachefs@redhat.com, Joel Becker , Christoph Hellwig , Alexander Viro , linux-fsdevel@vger.kernel.org, Eric Biggers , "Theodore Y . Ts'o" , linux-fscrypt@vger.kernel.org, Miklos Szeredi , linux-unionfs@vger.kernel.org Subject: [PATCH 04/10] Documentation: filesystems: directory-locking: drop doubled word Date: Fri, 3 Jul 2020 14:43:19 -0700 Message-Id: <20200703214325.31036-5-rdunlap@infradead.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703214325.31036-1-rdunlap@infradead.org> References: <20200703214325.31036-1-rdunlap@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org Drop the doubled word "the". Signed-off-by: Randy Dunlap Cc: Jonathan Corbet Cc: linux-doc@vger.kernel.org Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org --- Documentation/filesystems/directory-locking.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- linux-next-20200701.orig/Documentation/filesystems/directory-locking.rst +++ linux-next-20200701/Documentation/filesystems/directory-locking.rst @@ -28,7 +28,7 @@ RENAME_EXCHANGE in flags argument) lock if the target already exists, lock it. If the source is a non-directory, lock it. If we need to lock both, lock them in inode pointer order. Then call the method. All locks are exclusive. -NB: we might get away with locking the the source (and target in exchange +NB: we might get away with locking the source (and target in exchange case) shared. 5) link creation. Locking rules: @@ -56,7 +56,7 @@ rules: * call the method. All ->i_rwsem are taken exclusive. Again, we might get away with locking -the the source (and target in exchange case) shared. +the source (and target in exchange case) shared. The rules above obviously guarantee that all directories that are going to be read, modified or removed by method will be locked by caller.