Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp4550717pxa; Mon, 10 Aug 2020 11:51:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6mRw7FMVdsB8RcdYaD6l8ZjfZwx0fi4VE3AA7msqAZSig4Mqj8zHsd0F6f1JKz24Suib/ X-Received: by 2002:a17:906:3c43:: with SMTP id i3mr24028852ejg.133.1597085505752; Mon, 10 Aug 2020 11:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597085505; cv=none; d=google.com; s=arc-20160816; b=GTON4v28RDosKpuM7+VpDRyWvmFbkp8aJ1b4bK1L8DKuEgzqL+TFmBlAiGOr6qJSpT wxhPuJ5lPNCUTODMpzv8qcDZkKbroKzcQl+SJoA4aQFvjl6S75eJiGoDPp8bzu3t2Uir OjzABH4gzBOHOxLppl1GL53qsaBlizk73xkqGiRZrDimk7aSiZzCEYEueIHvbYVOr48F R/BbEAAZvnI3G2hXdcPuUWHGVajEOWBlxKWrWk6oc6klMclBMtF5YFTU1NK2+oE/SCSJ mH4bZBzyF8R1ovfLtp+4u4i2na0EaUweOSS+/zIXwq2ZStvceYF2/X28s9XYcQUl1uZ7 luKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=UFkXMNSmTNidA9A5YWnDTPnXEb/2kdO1/ASlFsc8dvM=; b=M/2cYkiCl2cbZ2dq3CuxrKybYFc2e2t/J+dOwj+EZv5wZCG/6W5YRgvCWUGcP+mMo8 6qF7TPDKSjb7ia8iOYJgf2ecHSC+I8vJs92iqdqdN1Ou1JXPl2lTno/N432l0nDPrxTO l2LIbUGs6Zw7FWpP77R3YIclrE/3KrZuGcv1alAtHrr+504OKIeQD6K725qxNcy6Nbm/ 77scPMXJr17KbLZe5uA+IdNTm3ka61ijUrdFntFn1DtVJpw/nfVv2Qrmh7YZilqCRGKt jLEQ8ZRvOUOxhvVDm6D89lz5Q9bfJxbV0CTmM/iLBE6afI8ZuJ+fG6P2dmwHvVvmknFD Mmhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qVVN+Gnj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h27si12959208edj.279.2020.08.10.11.51.22; Mon, 10 Aug 2020 11:51:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qVVN+Gnj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728231AbgHJSsk (ORCPT + 99 others); Mon, 10 Aug 2020 14:48:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728071AbgHJSsj (ORCPT ); Mon, 10 Aug 2020 14:48:39 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4433BC061756; Mon, 10 Aug 2020 11:48:39 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id l60so460939pjb.3; Mon, 10 Aug 2020 11:48:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=UFkXMNSmTNidA9A5YWnDTPnXEb/2kdO1/ASlFsc8dvM=; b=qVVN+GnjofU8KfHOEcOGjvmOVVIEkMz18eoB4oCRlb5evyq7/tuA3Mx/pxzMBbBuLD INeF/J4L3CHkFFsvsdn31/HplgjOIpfVtFdcUWtuMGEeDZmIskRAJBs1ImULM8K+0B4g hlJto/QWL2z0UjQGjlLxr/uGc7Co9KJlSyVMqZpVRwgItKq0EC+x2yU6sc6h9ZAgZaYB X+xgBBmx7gjAzlik2owYXlshj8MYxuOIpO4VV/bLJxX9cUXRurZ9jlUPCxJCMkhqM7vJ 8rHak05SgclBW0oE1Pp/cawLxsZ6ZcxZpxyaBQ4Q6mXjlJHQTqV+XLXp9rc+GiodA8cs zASg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=UFkXMNSmTNidA9A5YWnDTPnXEb/2kdO1/ASlFsc8dvM=; b=aaER9oX9QFwC8gQcvYF1WownhLhsh5zhMDU6CljZUATG3qcdNcNUOZiqr8KWopCaFA 6MXk04UNUs5tWx8StGDAdZWsTE2eMLEKSPifUt4pYAXSvSwJ2PW+g8PMms+ye7qg0a06 iE26m+VjP9amaZ2IXQDokgD0Kjl2sQTXIx9K3F4T75H3ICwLMG0SQvulXelpvGVkQ0zp RYdKepv9qYEVRuQx6HvRtycGNCHh6KnqtvmfetmnJjMsslf/C7YViSjlN/ZANDwbnKd5 0P8C72+tqO9Sqrf2xNPpSnc3QH+IFQDdltuAd7ZNvObU78NnfgxcU+DWDxQrkIyvlvda 4UJA== X-Gm-Message-State: AOAM533hGoj0lrOkrjum/uZ5E0V7XQqFDSg96c8UUBygUrpV73k1FULy jI6FVvJ5XL/BDRhaKNkv1sk= X-Received: by 2002:a17:90a:fd8c:: with SMTP id cx12mr641765pjb.157.1597085317803; Mon, 10 Aug 2020 11:48:37 -0700 (PDT) Received: from localhost.localdomain ([124.253.77.168]) by smtp.googlemail.com with ESMTPSA id gz7sm243218pjb.45.2020.08.10.11.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2020 11:48:36 -0700 (PDT) From: Puranjay Mohan To: Jonathan Corbet Cc: Puranjay Mohan , skhan@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Filesystems: Documentation: Replace deprecated :c:func: Usage Date: Tue, 11 Aug 2020 00:18:28 +0530 Message-Id: <20200810184828.29297-1-puranjay12@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace :c:func: with func() as the previous usage is deprecated. Signed-off-by: Puranjay Mohan --- Documentation/filesystems/journalling.rst | 66 +++++++++++------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/Documentation/filesystems/journalling.rst b/Documentation/filesystems/journalling.rst index 58ce6b395206..7e2be2faf653 100644 --- a/Documentation/filesystems/journalling.rst +++ b/Documentation/filesystems/journalling.rst @@ -10,27 +10,27 @@ Details The journalling layer is easy to use. You need to first of all create a journal_t data structure. There are two calls to do this dependent on how you decide to allocate the physical media on which the journal -resides. The :c:func:`jbd2_journal_init_inode` call is for journals stored in -filesystem inodes, or the :c:func:`jbd2_journal_init_dev` call can be used +resides. The jbd2_journal_init_inode() call is for journals stored in +filesystem inodes, or the jbd2_journal_init_dev() call can be used for journal stored on a raw device (in a continuous range of blocks). A journal_t is a typedef for a struct pointer, so when you are finally -finished make sure you call :c:func:`jbd2_journal_destroy` on it to free up +finished make sure you call jbd2_journal_destroy() on it to free up any used kernel memory. Once you have got your journal_t object you need to 'mount' or load the journal file. The journalling layer expects the space for the journal was already allocated and initialized properly by the userspace tools. -When loading the journal you must call :c:func:`jbd2_journal_load` to process +When loading the journal you must call jbd2_journal_load() to process journal contents. If the client file system detects the journal contents does not need to be processed (or even need not have valid contents), it -may call :c:func:`jbd2_journal_wipe` to clear the journal contents before -calling :c:func:`jbd2_journal_load`. +may call jbd2_journal_wipe() to clear the journal contents before +calling jbd2_journal_load(). Note that jbd2_journal_wipe(..,0) calls -:c:func:`jbd2_journal_skip_recovery` for you if it detects any outstanding -transactions in the journal and similarly :c:func:`jbd2_journal_load` will -call :c:func:`jbd2_journal_recover` if necessary. I would advise reading -:c:func:`ext4_load_journal` in fs/ext4/super.c for examples on this stage. +jbd2_journal_skip_recovery() for you if it detects any outstanding +transactions in the journal and similarly jbd2_journal_load() will +call jbd2_journal_recover() if necessary. I would advise reading +ext4_load_journal() in fs/ext4/super.c for examples on this stage. Now you can go ahead and start modifying the underlying filesystem. Almost. @@ -39,57 +39,57 @@ You still need to actually journal your filesystem changes, this is done by wrapping them into transactions. Additionally you also need to wrap the modification of each of the buffers with calls to the journal layer, so it knows what the modifications you are actually making are. To do -this use :c:func:`jbd2_journal_start` which returns a transaction handle. +this use jbd2_journal_start() which returns a transaction handle. -:c:func:`jbd2_journal_start` and its counterpart :c:func:`jbd2_journal_stop`, +jbd2_journal_start() and its counterpart jbd2_journal_stop(), which indicates the end of a transaction are nestable calls, so you can reenter a transaction if necessary, but remember you must call -:c:func:`jbd2_journal_stop` the same number of times as -:c:func:`jbd2_journal_start` before the transaction is completed (or more +jbd2_journal_stop() the same number of times as +jbd2_journal_start() before the transaction is completed (or more accurately leaves the update phase). Ext4/VFS makes use of this feature to simplify handling of inode dirtying, quota support, etc. Inside each transaction you need to wrap the modifications to the individual buffers (blocks). Before you start to modify a buffer you -need to call :c:func:`jbd2_journal_get_create_access()` / -:c:func:`jbd2_journal_get_write_access()` / -:c:func:`jbd2_journal_get_undo_access()` as appropriate, this allows the +need to call jbd2_journal_get_create_access() / +jbd2_journal_get_write_access() / +jbd2_journal_get_undo_access() as appropriate, this allows the journalling layer to copy the unmodified data if it needs to. After all the buffer may be part of a previously uncommitted transaction. At this point you are at last ready to modify a buffer, and once you are have done so you need to call -:c:func:`jbd2_journal_dirty_metadata`. Or if you've asked for access to a +jbd2_journal_dirty_metadata(). Or if you've asked for access to a buffer you now know is now longer required to be pushed back on the -device you can call :c:func:`jbd2_journal_forget` in much the same way as you -might have used :c:func:`bforget` in the past. +device you can call jbd2_journal_forget() in much the same way as you +might have used bforget() in the past. -A :c:func:`jbd2_journal_flush` may be called at any time to commit and +A jbd2_journal_flush() may be called at any time to commit and checkpoint all your transactions. -Then at umount time , in your :c:func:`put_super` you can then call -:c:func:`jbd2_journal_destroy` to clean up your in-core journal object. +Then at umount time , in your put_super() you can then call +jbd2_journal_destroy() to clean up your in-core journal object. Unfortunately there a couple of ways the journal layer can cause a deadlock. The first thing to note is that each task can only have a single outstanding transaction at any one time, remember nothing commits -until the outermost :c:func:`jbd2_journal_stop`. This means you must complete +until the outermost jbd2_journal_stop(). This means you must complete the transaction at the end of each file/inode/address etc. operation you perform, so that the journalling system isn't re-entered on another journal. Since transactions can't be nested/batched across differing journals, and another filesystem other than yours (say ext4) may be modified in a later syscall. -The second case to bear in mind is that :c:func:`jbd2_journal_start` can block +The second case to bear in mind is that jbd2_journal_start() can block if there isn't enough space in the journal for your transaction (based on the passed nblocks param) - when it blocks it merely(!) needs to wait for transactions to complete and be committed from other tasks, so -essentially we are waiting for :c:func:`jbd2_journal_stop`. So to avoid -deadlocks you must treat :c:func:`jbd2_journal_start` / -:c:func:`jbd2_journal_stop` as if they were semaphores and include them in +essentially we are waiting for jbd2_journal_stop(). So to avoid +deadlocks you must treat jbd2_journal_start() / +jbd2_journal_stop() as if they were semaphores and include them in your semaphore ordering rules to prevent -deadlocks. Note that :c:func:`jbd2_journal_extend` has similar blocking -behaviour to :c:func:`jbd2_journal_start` so you can deadlock here just as -easily as on :c:func:`jbd2_journal_start`. +deadlocks. Note that jbd2_journal_extend() has similar blocking +behaviour to jbd2_journal_start() so you can deadlock here just as +easily as on jbd2_journal_start(). Try to reserve the right number of blocks the first time. ;-). This will be the maximum number of blocks you are going to touch in this @@ -116,8 +116,8 @@ called after each transaction commit. You can also use that need processing when the transaction commits. JBD2 also provides a way to block all transaction updates via -:c:func:`jbd2_journal_lock_updates()` / -:c:func:`jbd2_journal_unlock_updates()`. Ext4 uses this when it wants a +jbd2_journal_lock_updates() / +jbd2_journal_unlock_updates(). Ext4 uses this when it wants a window with a clean and stable fs for a moment. E.g. :: -- 2.27.0